From patchwork Tue May 17 12:12:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Vlad X-Patchwork-Id: 9111851 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EE70D9F1C3 for ; Tue, 17 May 2016 12:09:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 13945202EC for ; Tue, 17 May 2016 12:09:53 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 0DBF5202F2 for ; Tue, 17 May 2016 12:09:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6D23C6E6C2; Tue, 17 May 2016 12:09:50 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id 68B486E6C2 for ; Tue, 17 May 2016 12:09:48 +0000 (UTC) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga104.fm.intel.com with ESMTP; 17 May 2016 05:09:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,324,1459839600"; d="scan'208";a="968678113" Received: from mcvlad-wk.rb.intel.com ([10.237.105.57]) by fmsmga001.fm.intel.com with ESMTP; 17 May 2016 05:09:48 -0700 From: Marius Vlad To: intel-gfx@lists.freedesktop.org Date: Tue, 17 May 2016 15:12:46 +0300 Message-Id: <1463487166-20570-1-git-send-email-marius.c.vlad@intel.com> X-Mailer: git-send-email 2.8.0.rc3 In-Reply-To: <1463486747-20550-1-git-send-email-gabriel.feceoru@intel.com> References: <1463486747-20550-1-git-send-email-gabriel.feceoru@intel.com> Cc: daniel.vetter@intel.com Subject: [Intel-gfx] [PATCH i-g-t] autotools/: Keep gem_concurrent_blit in tests/ and put gem_conccurent_all in EXTRAS. X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-5.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP An attempt to have piglit not taking too much time when listing tests, but also keep tests/gem_concurrent_blit into list of tests. This was added in a633ad03c6 (tests: Separate tests with lots of subtests) and tried to be fixed c785a89ee (autotools/: Allow building tests/gem_concurrent_{all, blit}) but without addressing the comments of the reviewer. While at it, remove tests-lists-full.txt as it not needed anymore. https://lists.freedesktop.org/archives/intel-gfx/2016-April/092795.html Signed-off-by: Marius Vlad --- tests/Makefile.am | 15 +++++---------- tests/Makefile.sources | 17 ++--------------- 2 files changed, 7 insertions(+), 25 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index c2c2025..359d911 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -14,11 +14,6 @@ test-list.txt: Makefile.sources @echo ${single_kernel_tests} ${multi_kernel_tests} >> $@ @echo END TESTLIST >> $@ -test-list-full.txt: Makefile.sources - @echo TESTLIST > $@ - @echo ${single_kernel_tests} ${multi_kernel_tests} ${extra_multi_kernel_tests} >> $@ - @echo END TESTLIST >> $@ - noinst_PROGRAMS = \ $(HANG) \ @@ -28,9 +23,9 @@ noinst_PROGRAMS = \ pkglibexec_PROGRAMS = \ gem_alive \ gem_stress \ + gem_concurrent_all \ $(TESTS_progs) \ $(TESTS_progs_M) \ - $(TESTS_progs_XM) \ $(NULL) dist_pkglibexec_SCRIPTS = \ @@ -45,14 +40,14 @@ dist_pkgdata_DATA = \ all-local: .gitignore .gitignore: Makefile.sources - @echo "$(pkglibexec_PROGRAMS) $(HANG) test-list.txt test-list-full.txt .gitignore" | sed 's/\s\+/\n/g' | sort > $@ + @echo "$(pkglibexec_PROGRAMS) $(HANG) test-list.txt .gitignore" | sed 's/\s\+/\n/g' | sort > $@ -pkgdata_DATA = test-list.txt test-list-full.txt +pkgdata_DATA = test-list.txt -EXTRA_PROGRAMS = $(HANG) +EXTRA_PROGRAMS = $(HANG) gem_concurrent_all EXTRA_DIST = $(common_files) -CLEANFILES = $(EXTRA_PROGRAMS) test-list.txt test-list-full.txt .gitignore +CLEANFILES = $(EXTRA_PROGRAMS) test-list.txt .gitignore AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) $(DEBUG_CFLAGS)\ -I$(srcdir)/.. \ diff --git a/tests/Makefile.sources b/tests/Makefile.sources index 7b5f316..22dbaca 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -22,6 +22,7 @@ TESTS_progs_M = \ gem_close_race \ gem_create \ gem_cs_tlb \ + gem_concurrent_blit \ gem_ctx_bad_exec \ gem_ctx_exec \ gem_ctx_param \ @@ -118,11 +119,6 @@ TESTS_progs_M = \ template \ $(NULL) -TESTS_progs_XM = \ - gem_concurrent_blit \ - gem_concurrent_all \ - $(NULL) - TESTS_progs = \ core_auth \ core_getclient \ @@ -226,14 +222,6 @@ multi_kernel_tests = \ $(NULL) -# This target contains testcases with lots of subtests. -# It was split from multi_kernel_tests because of the overhead of listing all -# the subtests in piglit -extra_multi_kernel_tests = \ - $(TESTS_progs_XM) \ - $(NULL) - - # This target is for simple testcase which don't expose any subtest. # # Your testcase should probably use igt_simple_main, but none of the other magic @@ -251,8 +239,7 @@ kernel_tests = \ kernel_tests_full = \ $(single_kernel_tests) \ $(multi_kernel_tests) \ - $(extra_multi_kernel_tests) \ - $(NULL) + $(NULL) # Test that exercise specific asserts in the test framework library and are # hence expected to fail.