From patchwork Sun Feb 28 18:45:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26027 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 3698544A922 for ; Sun, 28 Feb 2021 20:45:26 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 08CC768AA98; Sun, 28 Feb 2021 20:45:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f46.google.com (mail-ej1-f46.google.com [209.85.218.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF20268A97D for ; Sun, 28 Feb 2021 20:45:19 +0200 (EET) Received: by mail-ej1-f46.google.com with SMTP id k13so24114762ejs.10 for ; Sun, 28 Feb 2021 10:45:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=laLu2Q88TWzvyHpIMkxOnbiiUHxxJC6NBpTiF2MRVsE=; b=Tao3B+6onRSYnIGOhT2CLGs75and7+6kk69kzzme/WdzT/rjT6W8IF2RRJxGMO4UNJ 4gvo/fqrZ3ItTzpW6oUAiACGqZIC6jCD5PQQWlRrZuHaknMS3IjE2P/bqBekjB2vhu2I hz9VnJD7YfimX4CJMRHPTjbb+ZXtoYnJyqNp/f6nL1LzXVSTIQXzoMjNu7GKw99Gr9gh KhanMaU1TNsDcSx9wA6rCVkP1oklMJ06wtYcgxg5BJV/Kkjfh/Ta/z23roRn7LB+CNKh rfBrDM7cK8Du3AhqORxFmCbof70rZ8NlstyLtd1kB0Pq9mWdxgLbYIqndPBoA3tdd3hU +EkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=laLu2Q88TWzvyHpIMkxOnbiiUHxxJC6NBpTiF2MRVsE=; b=SxoPH3VhEvU03hRuX3rPJVl7gglOmyJx64tVzQDabEBCWntHiUJwztoRysDBYXGn3s /bBTh4lfQ6owgBwix/vO23N+y/vahGI6+KDHlCui69bo8aOPyqJGi/dTHcPCOrSC10hx gcllUgzPxaBcijbJTlFetcLaI871gLNHcnnprJPvB3sbfSFVQ0qSpZiUDxz/j3LcNUAi M6J+7RorAlXnGLj+TL5ujmCI47QIbUYBKS/e6v67Lr9s+1DHp/+Gi10pc5d5PpCTIwHz +F1dBmmTf3ZXuDpzwQwxY4QwdACOwOMnN7ejo9W+k+2C5GMq+i0tBNPDl/qzeJ/nh3WM 4sVA== X-Gm-Message-State: AOAM53367YfTCqLxk7lYI8yoUi0R41dMJnbCHgrp8kJpS7mjWUmrZgoW YGT7+x2yemi1twzZmmSyYnkCIJv5/RU= X-Google-Smtp-Source: ABdhPJw4acYq7CDx4WDqZoy3UKQqUSZdkPb8wy4LWdZsrQX6X8yKuZgaJbu31pfMdiFlxfvsNFxNPA== X-Received: by 2002:a17:906:6096:: with SMTP id t22mr12946188ejj.34.1614537918898; Sun, 28 Feb 2021 10:45:18 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id d14sm13126675edk.81.2021.02.28.10.45.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Feb 2021 10:45:18 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Feb 2021 19:45:06 +0100 Message-Id: <20210228184510.247073-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/5] tests/fate: Don't keep unnecessary temp files 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Some FATE tests use files created by other FATE tests as input files; this mostly affects the seek tests which use files from vsynth_lena as well as acodec-pcm as input files. In order to make this possible the temporary files of all the vsynth* and all acodec-pcm tests are kept. Yet only a fraction of these files are actually used. This commit changes this to only keep the files that are actually needed for other tests. This reduces the size of the tests/data/fate folder after a full FATE run from 2024727441B to 138739312B. Signed-off-by: Andreas Rheinhardt --- tests/fate/acodec.mak | 2 +- tests/fate/filter-video.mak | 1 + tests/fate/seek.mak | 1 + tests/fate/vcodec.mak | 4 ++-- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/fate/acodec.mak b/tests/fate/acodec.mak index 35b597859c..1b8c32b163 100644 --- a/tests/fate/acodec.mak +++ b/tests/fate/acodec.mak @@ -1,6 +1,6 @@ fate-acodec-%: CODEC = $(@:fate-acodec-%=%) fate-acodec-%: SRC = tests/data/asynth-44100-2.wav -fate-acodec-%: CMD = enc_dec wav $(SRC) $(FMT) "-b:a 128k -c $(CODEC) $(ENCOPTS)" wav "-c pcm_s16le $(DECOPTS)" -keep +fate-acodec-%: CMD = enc_dec wav $(SRC) $(FMT) "-b:a 128k -c $(CODEC) $(ENCOPTS)" wav "-c pcm_s16le $(DECOPTS)" "$(KEEP_OVERRIDE)" fate-acodec-%: CMP_UNIT = 2 fate-acodec-%: REF = $(SRC_PATH)/tests/ref/acodec/$(@:fate-acodec-%=%) diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 9c7e3489f4..a0d645cc4a 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -564,6 +564,7 @@ fate-filter-pad: CMD = video_filter "pad=iw*1.5:ih*1.5:iw*0.3:ih*0.2" FATE_FILTER_PP = fate-filter-pp fate-filter-pp1 fate-filter-pp2 fate-filter-pp3 fate-filter-pp4 fate-filter-pp5 fate-filter-pp6 FATE_FILTER_VSYNTH-$(CONFIG_PP_FILTER) += $(FATE_FILTER_PP) $(FATE_FILTER_PP): fate-vsynth1-mpeg4-qprd +fate-vsynth1-mpeg4-qprd: KEEP_OVERRIDE= -keep fate-filter-pp: CMD = framecrc -flags bitexact -export_side_data venc_params -idct simple -i $(TARGET_PATH)/tests/data/fate/vsynth1-mpeg4-qprd.avi -frames:v 5 -flags +bitexact -vf "pp=be/hb/vb/tn/l5/al" fate-filter-pp1: CMD = video_filter "pp=fq|4/be/hb/vb/tn/l5/al" diff --git a/tests/fate/seek.mak b/tests/fate/seek.mak index 98d2b54674..5efec32702 100644 --- a/tests/fate/seek.mak +++ b/tests/fate/seek.mak @@ -270,6 +270,7 @@ FATE_SEEK_EXTRA += $(FATE_SEEK_EXTRA-yes) $(FATE_SEEK) $(FATE_SAMPLES_SEEK) $(FATE_SEEK_EXTRA): libavformat/tests/seek$(EXESUF) $(FATE_SEEK) $(FATE_SAMPLES_SEEK): CMD = run libavformat/tests/seek$(EXESUF) $(TARGET_PATH)/tests/data/$(SRC) $(FATE_SEEK) $(FATE_SAMPLES_SEEK): fate-seek-%: fate-% +$(subst fate-seek-,fate-,$(FATE_SAMPLES_SEEK) $(FATE_SEEK)): KEEP_OVERRIDE = -keep fate-seek-%: REF = $(SRC_PATH)/tests/ref/seek/$(@:fate-seek-%=%) FATE_AVCONV += $(FATE_SEEK) diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index 1e9c0d5647..ef892366eb 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -4,8 +4,8 @@ fate-vsynth_lena-%: SRC = tests/data/vsynth_lena.yuv fate-vsynth3-%: SRC = tests/data/vsynth3.yuv fate-vsynth%: CODEC = $(word 3, $(subst -, ,$(@))) fate-vsynth%: FMT = avi -fate-vsynth%: CMD = enc_dec "rawvideo -s 352x288 -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s 352x288 -pix_fmt yuv420p -vsync 0 $(DECOPTS)" -keep "$(DECINOPTS)" -fate-vsynth3-%: CMD = enc_dec "rawvideo -s $(FATEW)x$(FATEH) -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s $(FATEW)x$(FATEH) -pix_fmt yuv420p -vsync 0 $(DECOPTS)" -keep "$(DECINOPTS)" +fate-vsynth%: CMD = enc_dec "rawvideo -s 352x288 -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s 352x288 -pix_fmt yuv420p -vsync 0 $(DECOPTS)" "$(KEEP_OVERRIDE)" "$(DECINOPTS)" +fate-vsynth3-%: CMD = enc_dec "rawvideo -s $(FATEW)x$(FATEH) -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s $(FATEW)x$(FATEH) -pix_fmt yuv420p -vsync 0 $(DECOPTS)" "" "$(DECINOPTS)" fate-vsynth%: CMP_UNIT = 1 fate-vsynth%: REF = $(SRC_PATH)/tests/ref/vsynth/$(@:fate-%=%)