From patchwork Fri Apr 19 16:05:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 12816 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id DC1704499FE for ; Fri, 19 Apr 2019 19:06:07 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BCA7F68A92D; Fri, 19 Apr 2019 19:06:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it1-f174.google.com (mail-it1-f174.google.com [209.85.166.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 87AA3687EE4 for ; Fri, 19 Apr 2019 19:06:01 +0300 (EEST) Received: by mail-it1-f174.google.com with SMTP id u65so8872378itc.2 for ; Fri, 19 Apr 2019 09:06:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=PWkvZQFQ/IajHivslyghdS3SxBD9KfMSAEM0hkRv1T8=; b=rSq5KxAuQadLh85XsPwLbfVW8I4A9mLY1b7PdSDtmDnba/F2hBe8Try3LAwLSFBmq0 VGJZyBRXoqiPv1NCpHf7g1/ElyL1JKuqJYmCO9UEVB6aIJSRC3uw9s3d75QWeDz9gMoQ Izt1D9kwrQpFO4thBDECNycw42nfi8wHgHzs/Rnx1/NRa3xER+wJD/lXI3IDiUbPDXCV GLUj8Wr8/3VKQBnG1ikLEVUyjAdZAHqxs267L/bN2jNDsZMo9nWwuUmPjxDrNgW0EUSl pZwT33U3D8+7MRMdDpfAzin94mlUQfoAKgnDfTJfxvM5aToyw5UdccYVWGWcWTjUOnq0 HAnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=PWkvZQFQ/IajHivslyghdS3SxBD9KfMSAEM0hkRv1T8=; b=tjlUnYUyGD6xHK78neGqyDneZ5gHPQKriR8kSIwD25KxPaF4WKhUnYo2aWTEypmBWy edolSBNnL3BEufE4ycdiCUwPX3fb9g2pHveyEhPyZdAnxFhfZBv4g8VG/qmiUkK333eH u+qRL6dvMhnHp2F1Aw3/ExdOwXR7GMjYETwqhIrX3SHptjCaZ2JNLISo3ceRx6I6NCGP NuwmutGiynlWB9B2iblpkkzINYlV1mo2Y/zFJfzfmGPSVRGfPbolQSEHnKNUoGYYmAcz Z4XWlxUmNIj61WH6EHuY4eE2mNRIwtQzkfW5JNIMk4Z6GROkXw48n9mFTS97l3EQju6c 2F9w== X-Gm-Message-State: APjAAAV/6r0+s5Xr8wtJXcMpsTMyZ5+n2Oz7aKiGpK8ybbCC4a9KPDmA TZEQ+mhzHFOmVBDK3bRCuyUoD7e2NYgxt60TO3FxVw== X-Google-Smtp-Source: APXvYqwPOkfDTLpDGc/G5GXixQx1eE15bZ9c3pSOhrddqjTdHt5rq8ENhoSgRQ5GIozvZKByJgIozOyN12FxEFH946w= X-Received: by 2002:a02:ab95:: with SMTP id t21mr3044670jan.89.1555689959720; Fri, 19 Apr 2019 09:05:59 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a02:5503:0:0:0:0:0 with HTTP; Fri, 19 Apr 2019 09:05:58 -0700 (PDT) In-Reply-To: References: From: Carl Eugen Hoyos Date: Fri, 19 Apr 2019 18:05:58 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH]tests/run-sh: Add execsuf to some calls of local tools X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 2019-04-19 16:12 GMT+02:00, Carl Eugen Hoyos : > 2019-04-19 13:11 GMT+02:00, Carl Eugen Hoyos : > >> Attached patch is needed here for fate on wsl with msvc, not >> sure why I didn't need this with mingw-gcc. > > Better tested and correct variant attached. And a third attempt. No idea why the others initially worked... Carl Eugen From f9efc98e031738016464d2443474bc78776d0a7c Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Fri, 19 Apr 2019 18:04:33 +0200 Subject: [PATCH] tests/fate-run: New variable hostexecsuf for local fate tools. Allows running fate on wsl with msvc. --- tests/Makefile | 1 + tests/fate-run.sh | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 50408c2..624292d 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -232,6 +232,7 @@ FATE += $(FATE_HW-yes) $(FATE) $(FATE_TESTS-no): export PROGSUF = $(PROGSSUF) $(FATE) $(FATE_TESTS-no): export EXECSUF = $(EXESUF) +$(FATE) $(FATE_TESTS-no): export HOSTEXECSUF = $(HOSTEXESUF) $(FATE) $(FATE_TESTS-no): $(FATE_UTILS:%=tests/%$(HOSTEXESUF)) | $(FATE_OUTDIRS) @echo "TEST $(@:fate-%=%)" $(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(TARGET_SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)' '$(CPUFLAGS)' '$(CMP_SHIFT)' '$(CMP_TARGET)' '$(SIZE_TOLERANCE)' '$(CMP_UNIT)' '$(GEN)' '$(HWACCEL)' '$(REPORT)' '$(KEEP)' diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 56c4efb..2f1991d 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -5,7 +5,7 @@ export LC_ALL=C base=$(dirname $0) . "${base}/md5.sh" -base64=tests/base64 +base64=tests/base64${HOSTEXECSUF} test="${1#fate-}" target_samples=$2 @@ -45,7 +45,7 @@ compare(){ } do_tiny_psnr(){ - psnr=$(tests/tiny_psnr "$1" "$2" $cmp_unit $cmp_shift 0) || return 1 + psnr=$(tests/tiny_psnr${HOSTEXECSUF} "$1" "$2" $cmp_unit $cmp_shift 0) || return 1 val=$(expr "$psnr" : ".*$3: *\([0-9.]*\)") size1=$(expr "$psnr" : '.*bytes: *\([0-9]*\)') size2=$(expr "$psnr" : '.*bytes:[ 0-9]*/ *\([0-9]*\)') @@ -206,7 +206,7 @@ enc_dec(){ ffmpeg $8 $DEC_OPTS -i $tencfile $ENC_OPTS $dec_opt $FLAGS \ -f $dec_fmt -y $tdecfile || return do_md5sum $decfile - tests/tiny_psnr $srcfile $decfile $cmp_unit $cmp_shift + tests/tiny_psnr${HOSTEXECSUF} $srcfile $decfile $cmp_unit $cmp_shift } transcode(){ @@ -455,7 +455,7 @@ audio_match(){ cleanfiles="$cleanfiles $decfile" ffmpeg -i "$sample" -bitexact $extra_args -y $decfile - tests/audiomatch $decfile $trefile + tests/audiomatch${HOSTEXECSUF} $decfile $trefile } concat(){ -- 1.7.10.4