From patchwork Sun Aug 2 20:38:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 21462 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 96557449840 for ; Sun, 2 Aug 2020 23:39:03 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 83ECD68B89F; Sun, 2 Aug 2020 23:39:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f67.google.com (mail-lf1-f67.google.com [209.85.167.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E7DB768B743 for ; Sun, 2 Aug 2020 23:38:55 +0300 (EEST) Received: by mail-lf1-f67.google.com with SMTP id m15so18739330lfp.7 for ; Sun, 02 Aug 2020 13:38:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=xeZT1SOTyEn9Que4fySvxKWF8/IkCyB5KPvGu3P9BVU=; b=KXSMVey+MceDx17yKSzSErrfCxQMo3kZPcjFtBEOVh8kxE2J+Q6h59BPMeS/hnUVot e3OQBN8YMgv4eg+N/q4SEqjaginq4J52HWlW82YbMb7y+6xt44Cj5pwlg/pMLgeZ59Yw I4FCzBD+/Cgg4fhsij5Nhx3v8edJMLUIAMt/dicolFHEeKQ3JQcFubky+gn6ioe45c+s SxihKstl0v4AZX8ggCim10sDFL1G/FfyJ3GYCzUCTl3FjBHVUSc68hfP69pMjZ8rV6Jh MVz48DiV+3L2LbxxGq+sNKv4QPKRjz25/+gmfe3Z6Z2YrngB/XY5nLxb7WkDpa2Xa5js KJew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=xeZT1SOTyEn9Que4fySvxKWF8/IkCyB5KPvGu3P9BVU=; b=dMpuX20Nq8ujoZfEnOeYJFyEvtXF63YCZZkVCKDso9cZhSizQNOupKcw0uZm5k5p6C GQhoqYeW9j50o8uo75pmiJ9ZvnkeHxLHth8xVk9kBx233unLECrOW7OYczVXEClda6K1 DQNE5fBCecWf30FBbyuJmiSOO78YZCN/IX6k8pHLNgbUbxIKiZueHQ2wRVVgS/iMnc5B 0TZ5lmhp3SoAZk+mQwhWDEaX5WMqGWpkbPwgl04TZlRyIbikFQb5UrR9Xge4iBGQqnzi 9nkgq2IAnGAM3BypmjSQFBUinKdCAZjf9qKa070TY1567X8W1CI2FYqAoKWNGtv1bDsR Ogpg== X-Gm-Message-State: AOAM532g1wfhzyrnV2xxvTfmycEyWBzVr3eqQXYvHVwS8PYKqw6D/uhx /WFJ3fLcqAOH3H9m/mhULPTRnrWwC9tKMg== X-Google-Smtp-Source: ABdhPJzWtT8vagXy1Ykv+BW/FBYDE9+kO4CHm9aD4l4VVrhpHrUM5vaXhvoC7tHB/OHHZq+DoMekCw== X-Received: by 2002:ac2:5683:: with SMTP id 3mr6704391lfr.69.1596400734941; Sun, 02 Aug 2020 13:38:54 -0700 (PDT) Received: from localhost.localdomain (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id k84sm84070lfd.90.2020.08.02.13.38.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Aug 2020 13:38:54 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 2 Aug 2020 23:38:52 +0300 Message-Id: <20200802203852.31097-2-martin@martin.st> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200802203852.31097-1-martin@martin.st> References: <20200802203852.31097-1-martin@martin.st> Subject: [FFmpeg-devel] [PATCH 2/2] test: hlsenc: Fix the dependencies of the tests 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Most tests here don't depend on samples, thus add them to FATE_FFMPEG instead of FATE_SAMPLES_FFMPEG. The fate-hls-fmp4_ac3 test depends on both samples and ffprobe; add that one separately to FATE_SAMPLES_FFMPEG_FFPROBE instead. --- tests/fate/hlsenc.mak | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/fate/hlsenc.mak b/tests/fate/hlsenc.mak index 3c767fd5d9..7e14f1e577 100644 --- a/tests/fate/hlsenc.mak +++ b/tests/fate/hlsenc.mak @@ -105,9 +105,10 @@ tests/data/hls_fmp4_ac3.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data -hls_time 2 -hls_segment_filename "$(TARGET_PATH)/tests/data/hls_fmp4_ac3_%d.m4s" \ $(TARGET_PATH)/tests/data/hls_fmp4_ac3.m3u8 2>/dev/null -FATE_HLSENC-$(call ALLYES, HLS_DEMUXER EAC3_DEMUXER) += fate-hls-fmp4_ac3 +FATE_HLSENC_SAMPLES_FFPROBE-$(call ALLYES, HLS_DEMUXER EAC3_DEMUXER) += fate-hls-fmp4_ac3 fate-hls-fmp4_ac3: tests/data/hls_fmp4_ac3.m3u8 fate-hls-fmp4_ac3: CMD = probeaudiostream $(TARGET_PATH)/tests/data/now_ac3.mp4 -FATE_SAMPLES_FFMPEG += $(FATE_HLSENC-yes) -fate-hlsenc: $(FATE_HLSENC-yes) +FATE_FFMPEG += $(FATE_HLSENC-yes) +FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_HLSENC_SAMPLES_FFPROBE-yes) +fate-hlsenc: $(FATE_HLSENC-yes) $(FATE_HLSENC_SAMPLES_FFPROBE-yes)