From c581d8425b2327f92c39fc63028b46a462424a63 Mon Sep 17 00:00:00 2001 From: Oliver Chang Date: Mon, 14 Jul 2025 13:57:35 +1000 Subject: [PATCH 1/2] ffmpeg: stop build script a bit later when CAPTURE_REPLAY_SCRIPT is set This is so we include the fate suite in the cached image. --- projects/ffmpeg/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/ffmpeg/build.sh b/projects/ffmpeg/build.sh index e44507535d8d..d311228b9880 100755 --- a/projects/ffmpeg/build.sh +++ b/projects/ffmpeg/build.sh @@ -223,10 +223,6 @@ fi make clean make -j$(nproc) install -if [[ -n ${CAPTURE_REPLAY_SCRIPT-} ]]; then - exit 0 -fi - # Download test samples, will be used as seed corpus. # DISABLED. # TODO: implement a better way to maintain a minimized seed corpora @@ -237,6 +233,10 @@ make fate-rsync SAMPLES=$TEST_SAMPLES_PATH rsync -av rsync://samples.ffmpeg.org/samples/avi/ffv1/testset/ $SRC/ffmpeg/ffv1testset +if [[ -n ${CAPTURE_REPLAY_SCRIPT-} ]]; then + exit 0 +fi + # Build the fuzzers. cd $SRC/ffmpeg From 0914722009bf45fe14f5def549db185e09cf9cac Mon Sep 17 00:00:00 2001 From: Oliver Chang Date: Mon, 14 Jul 2025 13:59:00 +1000 Subject: [PATCH 2/2] Update build.sh --- projects/ffmpeg/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/ffmpeg/build.sh b/projects/ffmpeg/build.sh index d311228b9880..2950aee39503 100755 --- a/projects/ffmpeg/build.sh +++ b/projects/ffmpeg/build.sh @@ -231,12 +231,12 @@ make -j$(nproc) install export TEST_SAMPLES_PATH=$SRC/ffmpeg/fate-suite/ make fate-rsync SAMPLES=$TEST_SAMPLES_PATH -rsync -av rsync://samples.ffmpeg.org/samples/avi/ffv1/testset/ $SRC/ffmpeg/ffv1testset - if [[ -n ${CAPTURE_REPLAY_SCRIPT-} ]]; then exit 0 fi +rsync -av rsync://samples.ffmpeg.org/samples/avi/ffv1/testset/ $SRC/ffmpeg/ffv1testset + # Build the fuzzers. cd $SRC/ffmpeg