From patchwork Sun Feb 18 15:10:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46351 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dda5:b0:19e:cdac:8cce with SMTP id kw37csp800182pzb; Sun, 18 Feb 2024 07:09:08 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUQ8oHOPWeA9HyBYsy6oIPYudI0tWqeHbWDrGJqBsURQgYDRKgS1mshCGc2Xc3TkER/y29+4Dg3NSN6bj6VOqbVPFit87NiiO5+gQ== X-Google-Smtp-Source: AGHT+IGMqzi2L4u+JriXTpka8nPTgWlH0FNcwnAgVQ6ApsqEJ30Y5541n7F0NlQrOsgYCcvzESXN X-Received: by 2002:a50:cd07:0:b0:560:3109:57e7 with SMTP id z7-20020a50cd07000000b00560310957e7mr7263848edi.0.1708268947906; Sun, 18 Feb 2024 07:09:07 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e4-20020a50fb84000000b005642518ae08si1286287edq.583.2024.02.18.07.09.07; Sun, 18 Feb 2024 07:09:07 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=WO0roaBP; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6C4E768D35E; Sun, 18 Feb 2024 17:09:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2067.outbound.protection.outlook.com [40.92.49.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 42C7268D2D0 for ; Sun, 18 Feb 2024 17:09:02 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G8l6/7yJOTQOQQQ6Zob6NUzZ9d570jT0N0KglMHPuK+tvzmOeSoIXDin21J9ZicV20Jx9JJBgNmAomO/PSrWf/RksxzKdqhop/zwCzh3uUT7FYNGZfCRnLvP646cny+watfz5FzSyxYBanzFsG6c2eedVzR3Xy+4CYDHgbqcXxRx833ApA0WxU01Q4W6zMpZHWnCHhE9GrWIouvddtKyFN0k2nEJakp6nDTHLlvdHRgGwtgcNGEIjPYG67Bam2zDQNhipKfXOxr7NuA7SullKVcJxjgHk+wtdgL0iMS7jXrCWcoISeXgOuA4gBe2MOkeS1c9JJ8yn2RimJIM+pkDlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=hKtlTimK5R3Sxc745BPc4WX1HcfmY3fs60hOODgKO8g=; b=W2OjjQHWlboVqx/qM6GtT24G3gdjoQqMXH+Y7ChKiMiQu7PXEXykEKEuoocDLltTjDxnbS40C1Tu7+UIdvP7rn0bVyuWVvKOGZXD36vC9QSe6b0+k6Xo6GyrczuwcTyZDZExsqfX5OMA9Gtnk+Pw4hWTxZmX895XVKbwkW9vD7g9KrwP6jhA7gIpjhkbAcRedQUzGjXaUIHhn4ycdJBx5LfLDYRScHCIcSsSMGrog5bB3snG9KnwxZ5Ym16Mi3ZOgJcZ/z1VoFbdNwj4QCgLuXzDHJzYqlAFLADTze6/16r9A9BSuFxKj17Sbu1pklk9td2heynaIn1nzNa3cPEu1Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hKtlTimK5R3Sxc745BPc4WX1HcfmY3fs60hOODgKO8g=; b=WO0roaBPBDQcdc4mLNRaEkx9jzhLNzmZOgH/w9ancGA6L52yPPlnRNW8S59pD0ux7lhodAeTMAaSJdbUcLNC7fSKJWmQTX7jQH0Ij585k1HJDTgjJZnYFPcBgG7DSalNpziGp3eHM3dVpLGrk3wp+TCtELjKZTCz5dB1VEcpJyJdK4i2VK0sl8qmpAwysIw1f8MU1/ZqcWl4x5+FI2gLZx6o7HCkT80lPZUADhfDggQvTwWHjGhsxhs4muEA/AuzLwhi3SeUcP7138DZbRiX71vofyc3C9OYKYIg0azOSzEVAiKwIBwkW16/yF7DrJSa/MbaAON2u+jmx5lDkpWjXA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0073.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:36c::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7292.37; Sun, 18 Feb 2024 15:09:01 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7292.033; Sun, 18 Feb 2024 15:09:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Feb 2024 16:10:52 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [XRilT4iF2zows0cxN0S+O2Q2zERZFgukb7bZAi2snwI=] X-ClientProxiedBy: ZR0P278CA0107.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::22) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240218151052.3971652-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0073:EE_ X-MS-Office365-Filtering-Correlation-Id: 43eede34-d84f-4fde-a04d-08dc309389d5 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BsjTwVZXRdPUjXiSsCRCAoV1igBtLUYL5XdZ16vFZOOZyKkgadJCqxA01j9m2qaa0KP2bMfLriuChyhDfqlLUd2x4o/+/9kakPNVAqnSI0OYVG5+AcagXSBWU0Cvfq6qUe01cAgxwD2FPXRIEi2a4cJLgmDIadiIOofZWlhxM/KwGkVNQlkWbL6/BMO/5iG3rUxcFilAwIUR8qdqGYabKDXm4c6A1DqDLNKKXVQT/pEdV/5EtQXiefVvD3hDUi7j2yvl/SFPC0yWiuCBcrlgd8D9qj9sEJTa6lk4ut9MM9nQkMnqFQ+/FAMogT2jvoeexh4EFQqzxh1jcGPsfoSS05xSBqT+qi8R9K8utyNaWtgDMKAswedll4C4PGMNdg0XV59qCHWfw5yegW+9DPvwUImlBFXDr/4LzHs8IPc7gsDy49lF4ylvfLQNCA0/Z5ATzLViuIfCZwD2QbpHYnITyFerICqHfAL8XW+MlOkubFK5gd+NqKK/G0FSN9RfyarrRCt0DibrQHWhcSr9eor9rF16l8kViV2tCqnYPm01lYf98E2AgeNvjC2+jCkKFd3jeMzjm1yz4vhIkG5WDFnj3jHU3FWBw6R7Lh3EBmIeQRgZj5elb4qe1fEtAk1Vk1o/ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZsL45D+9J1B28owNYSFeNRxlN6ix2zPcrg3FYim3GfP6ApWEIc77bzOu6ELBboknq5VP8aGwjUggyxSKolzdm17dSiOUWX3djlcR63Jpi19vKnzPiE5weprLhe9aTc7Ogbo6N/PWmTx8oy5L+9V4AQp9pTqcsrFYFutkRFQ54CCVPaGjX5i9fCS2x74eZE7AKXng5xW6Ja66QMwSmtRwGctkk64RDQgW+VtrOCY99jAUNLYfTM0c7+WrOC5SOu9P0ta3weNG3HO1ehj/vQa7u7BJzqeCq+WNsJyKvLWxJoBMC/XdrdaQGhQrz1dymICwgYvcC0DV/VFZE6POVIXEf5gwPmg2ic/vT/WJSecZbAjVT8s1s/pHFSqieeBwmRc9CdHcnA9myPiJb9h1xZ6S+eCcAVVu84C/cy5C8AqBWhGYnJJh2pmy3bx6zPZ2QgNND/rG+AD0bRqI6lVsTDGdW4vE4rLesO9uKbo2HM5gNtqT378rp2/pydVhhtSJ3FTYueGlZ7SNgjomE6u5QPUqB4VMskuLwk9PVhZDCoi+sZtAimD+MJOsyTHPYR7DHiF8cK/nbzlY5T7akPpX7Vwfit5O4Yb/hkRXXYWgrCmMp/wgGKsFJdw0sbkhrS4fJNV0aJZ7Gge94i+z3lfpWJzKr9uVBkobWkKpwOiczK+VSqIsHgRJFa27al59g9g7mKmx79ca30Xoaqn5+e/3Aery0xN8J7WlCwzkjOhAUEyz+b3yFvICqAl2hMkigJc5b1EBl/xZk1+9fdap1B6ZGz1wn28vu5slWl3p5sJC/kw+0DqlEULjXNm0jkikUOoLjid3TgtKHU5yO4yKPcOU5s3eGZj/YxCVOzZtFafuYGwsRajxVkJ9sW3la6FCU9e/e6QyrWr3W92k3xfsbGXMli3llDh/TdD7FOKoOe84HDLRS+72xjGrMM5FY9chMkv+4jOQaGJPjgQejUrUSPKHeWt+cKHYGVySrBTkOdzz0Z+i/JW8R2K2uPzCluJ2sj68TIwEqMVByDA33moEuHUEYeYQxudIFoRpcw1sKvB290bRnW+2hO0KT0PnE05nPbBjW16yRRMJ2HzaqzsYPtb+jwQtyl8SBPa3yeP0C6g6iTdT7BUhzbrEoo/wEqoh8pWKVxpQyDzrVWUD3heX8PWSfxyDFJakJtsmcvefw3AqfOOxhx4OkXqjfii0C/R9IQ1+brNmC9HHS8ErG3zklbiJ6PMV3Vx3Z0nygyZgCQ/asT+o+JqjUth+vR8tD535GGTaU1DToOvla9mjQQFbhS4PGykZFw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 43eede34-d84f-4fde-a04d-08dc309389d5 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2024 15:09:01.2148 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8P250MB0073 Subject: [FFmpeg-devel] [PATCH 2/2] tests/fate-run: Do not ignore errors from intermediate commands X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: i1BpEA/6/WOM Otherwise the test may pass while ignoring errors from sanitizers. Signed-off-by: Andreas Rheinhardt --- tests/fate-run.sh | 44 ++++++++++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 9257fb368b..4b85fbf464 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -334,7 +334,7 @@ do_avconv(){ f="$1" shift set -- $* ${target_path}/$f - run_avconv $* + run_avconv $* || return do_md5sum $f echo $(wc -c $f) } @@ -351,7 +351,8 @@ lavf_audio(){ outdir="tests/data/lavf" file=${outdir}/lavf.$t test "$keep" -ge 1 || cleanfiles="$cleanfiles $file" - do_avconv $file -auto_conversion_filters $DEC_OPTS $1 -ar 44100 -f s16le -i $pcm_src "$ENC_OPTS -metadata title=lavftest" -t 1 -qscale 10 $2 + do_avconv $file -auto_conversion_filters $DEC_OPTS $1 -ar 44100 -f s16le -i $pcm_src \ + "$ENC_OPTS -metadata title=lavftest" -t 1 -qscale 10 $2 || return test "$4" = "disable_crc" || do_avconv_crc $file -auto_conversion_filters $DEC_OPTS $3 -i $target_path/$file } @@ -361,7 +362,8 @@ lavf_container(){ outdir="tests/data/lavf" file=${outdir}/lavf.$t test "$keep" -ge 1 || cleanfiles="$cleanfiles $file" - do_avconv $file -auto_conversion_filters $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $DEC_OPTS -ar 44100 -f s16le $1 -i $pcm_src "$ENC_OPTS -metadata title=lavftest" -b:a 64k -t 1 -qscale:v 10 $2 + do_avconv $file -auto_conversion_filters $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $DEC_OPTS \ + -ar 44100 -f s16le $1 -i $pcm_src "$ENC_OPTS -metadata title=lavftest" -b:a 64k -t 1 -qscale:v 10 $2 || return test "$3" = "disable_crc" || do_avconv_crc $file -auto_conversion_filters $DEC_OPTS -i $target_path/$file $3 } @@ -384,7 +386,8 @@ lavf_container_fate() file=${outdir}/lavf.$t cleanfiles="$cleanfiles $file" input="${target_samples}/$1" - do_avconv $file -auto_conversion_filters $DEC_OPTS $2 -i "$input" "$ENC_OPTS -metadata title=lavftest" -vcodec copy -acodec copy + do_avconv $file -auto_conversion_filters $DEC_OPTS $2 -i "$input" \ + "$ENC_OPTS -metadata title=lavftest" -vcodec copy -acodec copy || return do_avconv_crc $file -auto_conversion_filters $DEC_OPTS -i $target_path/$file $3 } @@ -401,7 +404,9 @@ lavf_image(){ cleanfiles="$cleanfiles $filename" done fi - run_avconv $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $1 "$ENC_OPTS -metadata title=lavftest" -vf scale -frames $nb_frames -y -qscale 10 $target_path/$file + run_avconv $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src $1 \ + "$ENC_OPTS -metadata title=lavftest" -vf scale -frames $nb_frames \ + -y -qscale 10 $target_path/$file || return if [ -z "$no_file_checksums" ]; then do_md5sum ${outdir}/02.$t echo $(wc -c ${outdir}/02.$t) @@ -414,7 +419,8 @@ lavf_image2pipe(){ t="${t%pipe}" outdir="tests/data/lavf" file=${outdir}/${t}pipe.$t - do_avconv $file -auto_conversion_filters $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src -f image2pipe "$ENC_OPTS -metadata title=lavftest" -t 1 -qscale 10 + do_avconv $file -auto_conversion_filters $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src \ + -f image2pipe "$ENC_OPTS -metadata title=lavftest" -t 1 -qscale 10 || return do_avconv_crc $file -auto_conversion_filters $DEC_OPTS -f image2pipe -i $target_path/$file } @@ -423,7 +429,8 @@ lavf_video(){ outdir="tests/data/lavf" file=${outdir}/lavf.$t test "$keep" -ge 1 || cleanfiles="$cleanfiles $file" - do_avconv $file -auto_conversion_filters $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src "$ENC_OPTS -metadata title=lavftest" -t 1 -qscale 10 $1 $2 + do_avconv $file -auto_conversion_filters $DEC_OPTS -f image2 -c:v pgmyuv -i $raw_src \ + "$ENC_OPTS -metadata title=lavftest" -t 1 -qscale 10 $1 $2 || return do_avconv_crc $file -auto_conversion_filters $DEC_OPTS -i $target_path/$file $1 } @@ -477,7 +484,7 @@ pixfmt_conversion(){ file=${outdir}/${conversion}.yuv cleanfiles="$cleanfiles $raw_dst $file" run_avconv $DEC_OPTS -r 1 -f image2 -c:v pgmyuv -i $raw_src \ - $ENC_OPTS -f rawvideo -t 1 -s 352x288 -pix_fmt $conversion $target_path/$raw_dst + $ENC_OPTS -f rawvideo -t 1 -s 352x288 -pix_fmt $conversion $target_path/$raw_dst || return do_avconv $file $DEC_OPTS -f rawvideo -s 352x288 -pix_fmt $conversion -i $target_path/$raw_dst \ $ENC_OPTS -f rawvideo -s 352x288 -pix_fmt yuv444p } @@ -516,7 +523,7 @@ pixfmts(){ outertest=$test for pix_fmt in $pix_fmts; do test=$pix_fmt - video_filter "${prefilter_chain}scale,format=$pix_fmt,$filter=$filter_args" -pix_fmt $pix_fmt -frames:v $nframes + video_filter "${prefilter_chain}scale,format=$pix_fmt,$filter=$filter_args" -pix_fmt $pix_fmt -frames:v $nframes || return done rm $in_fmts $scale_in_fmts $scale_out_fmts $scale_exclude_fmts @@ -533,16 +540,20 @@ gapless(){ cleanfiles="$cleanfiles $decfile1 $decfile2 $decfile3" # test packet data - ffmpeg -auto_conversion_filters $extra_args -i "$sample" -bitexact -c:a copy -f framecrc -y $(target_path $decfile1) + ffmpeg -auto_conversion_filters $extra_args -i "$sample" \ + -bitexact -c:a copy -f framecrc -y $(target_path $decfile1) || return do_md5sum $decfile1 # test decoded (and cut) data - ffmpeg -auto_conversion_filters $extra_args -i "$sample" -bitexact -f wav md5: + ffmpeg -auto_conversion_filters $extra_args -i "$sample" -bitexact -f wav md5: || return # the same as above again, with seeking to the start - ffmpeg -auto_conversion_filters $extra_args -ss 0 -seek_timestamp 1 -i "$sample" -bitexact -c:a copy -f framecrc -y $(target_path $decfile2) + ffmpeg -auto_conversion_filters $extra_args -ss 0 -seek_timestamp 1 -i "$sample" \ + -bitexact -c:a copy -f framecrc -y $(target_path $decfile2) || return do_md5sum $decfile2 - ffmpeg -auto_conversion_filters $extra_args -ss 0 -seek_timestamp 1 -i "$sample" -bitexact -f wav md5: + ffmpeg -auto_conversion_filters $extra_args -ss 0 -seek_timestamp 1 -i "$sample" \ + -bitexact -f wav md5: || return # test packet data, with seeking to a specific position - ffmpeg -auto_conversion_filters $extra_args -ss 5 -seek_timestamp 1 -i "$sample" -bitexact -c:a copy -f framecrc -y $(target_path $decfile3) + ffmpeg -auto_conversion_filters $extra_args -ss 5 -seek_timestamp 1 -i "$sample" \ + -bitexact -c:a copy -f framecrc -y $(target_path $decfile3) || return do_md5sum $decfile3 } @@ -555,7 +566,8 @@ gaplessenc(){ cleanfiles="$cleanfiles $file1" # test data after reencoding - ffmpeg -i "$sample" -bitexact -map 0:a -c:a $codec -af aresample -f $format -y "$(target_path "$file1")" + ffmpeg -i "$sample" -bitexact -map 0:a -c:a $codec -af aresample \ + -f $format -y "$(target_path "$file1")" || return probegaplessinfo "$(target_path "$file1")" } @@ -567,7 +579,7 @@ audio_match(){ decfile="${outdir}/${test}.wav" cleanfiles="$cleanfiles $decfile" - ffmpeg -auto_conversion_filters -i "$sample" -bitexact $extra_args -y $(target_path $decfile) + ffmpeg -auto_conversion_filters -i "$sample" -bitexact $extra_args -y $(target_path $decfile) || return tests/audiomatch${HOSTEXECSUF} $decfile $trefile }