From patchwork Thu Apr 9 16:13:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Wood X-Patchwork-Id: 6189381 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 130CFBF4A6 for ; Thu, 9 Apr 2015 16:14:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1BD11202E6 for ; Thu, 9 Apr 2015 16:14:04 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id E06E72024F for ; Thu, 9 Apr 2015 16:14:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DF6486E7EF; Thu, 9 Apr 2015 09:14:01 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by gabe.freedesktop.org (Postfix) with ESMTP id 72BB66E7ED for ; Thu, 9 Apr 2015 09:14:00 -0700 (PDT) Received: by widdi4 with SMTP id di4so98271358wid.0 for ; Thu, 09 Apr 2015 09:13:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=YjeX36lQ0fuL4MbPc9IqjxPPEhUA+PQgUE5HZBgT3B4=; b=YLsMf51jIfOjOf5WLON727mpWaVOUaijHKyzKJBgG+cgBOj2qe7LE3cuEB52/nQcP+ 4+h5zQO9nDlpu7NdWX0SUna90suOnNdEZ99DKatZfnwX9ouICT5hZaPEv2SDqqdoHyUe IuX6t4IyvaoF4SsTN6Y3bTyB5TltEZue0z3HD8DY0mwD5XCTNh+oWCtjMo+8UGerU5LY wyWPiCnQCwloDKKS9Dwv+W8u8N1y29bcfSH8SmsAeFEJhhHWu63g5iCgBH5yfp4PPDha 03/Xlq3TQJUg9fz3R6FOoHl7k5xkN61MUNMAqbp9M+HkPtRmKeuJza/wyCeoX4f3bjYa iciw== X-Gm-Message-State: ALoCoQkviBKXcvKvRm0Bs2ef/KiN7cDXlK6lF3bM8eUkE1W+F3ceV3GawKFQI1ZCy+KUv381mQuj X-Received: by 10.194.8.99 with SMTP id q3mr62778351wja.88.1428596039153; Thu, 09 Apr 2015 09:13:59 -0700 (PDT) Received: from pistachio.icx.intel.com ([83.217.123.106]) by mx.google.com with ESMTPSA id o5sm21143330wia.0.2015.04.09.09.13.57 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Apr 2015 09:13:58 -0700 (PDT) From: Thomas Wood To: intel-gfx@lists.freedesktop.org Date: Thu, 9 Apr 2015 17:13:53 +0100 Message-Id: <1428596034-17100-1-git-send-email-thomas.wood@intel.com> X-Mailer: git-send-email 2.1.0 Subject: [Intel-gfx] [PATCH i-g-t v2 1/2] tests: create a single combined test list 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=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 All tests now respond in a consistent way such that separate lists for tests with and without subtests are no longer necessary. v2: fix other references to the test list Signed-off-by: Thomas Wood --- docs/reference/intel-gpu-tools/Makefile.am | 2 +- lib/tests/igt_command_line.sh | 2 +- tests/Makefile.am | 23 ++++------------------- 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/docs/reference/intel-gpu-tools/Makefile.am b/docs/reference/intel-gpu-tools/Makefile.am index fa19701..0033295 100644 --- a/docs/reference/intel-gpu-tools/Makefile.am +++ b/docs/reference/intel-gpu-tools/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -TESTLISTS = $(top_builddir)/tests/single-tests.txt $(top_builddir)/tests/multi-tests.txt +TESTLISTS = $(top_builddir)/tests/test-list.txt KEYWORDS = (invalid|hang|swap|thrash|crc|tiled|tiling|rte|ctx|render|blt|bsd|vebox|exec|rpm) xml/igt_test_programs_%_programs.xml: $(TESTLISTS) diff --git a/lib/tests/igt_command_line.sh b/lib/tests/igt_command_line.sh index a057943..e83a548 100755 --- a/lib/tests/igt_command_line.sh +++ b/lib/tests/igt_command_line.sh @@ -25,7 +25,7 @@ # Check that command line handling works consistently across all tests # -TESTLIST=`cat $top_builddir/tests/single-tests.txt $top_builddir/tests/multi-tests.txt` +TESTLIST=`cat $top_builddir/tests/test-list.txt` if [ $? -ne 0 ]; then echo "Error: Could not read test lists" exit 99 diff --git a/tests/Makefile.am b/tests/Makefile.am index dc864f4..11f7f96 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -5,26 +5,11 @@ if HAVE_NOUVEAU endif if BUILD_TESTS -all-local: single-tests.txt multi-tests.txt +all-local: test-list.txt -list-single-tests: - @echo TESTLIST - @echo ${single_kernel_tests} - @echo END TESTLIST - -list-multi-tests: - @echo TESTLIST - @echo ${multi_kernel_tests} - @echo END TESTLIST - -single-tests.txt: Makefile.sources - @echo TESTLIST > $@ - @echo ${single_kernel_tests} >> $@ - @echo END TESTLIST >> $@ - -multi-tests.txt: Makefile.sources +test-list.txt: Makefile.sources @echo TESTLIST > $@ - @echo ${multi_kernel_tests} >> $@ + @echo ${single_kernel_tests} ${multi_kernel_tests} >> $@ @echo END TESTLIST >> $@ noinst_PROGRAMS = \ @@ -52,7 +37,7 @@ dist_pkgdata_DATA = \ EXTRA_PROGRAMS = $(HANG) EXTRA_DIST = $(common_files) -CLEANFILES = $(EXTRA_PROGRAMS) single-tests.txt multi-tests.txt +CLEANFILES = $(EXTRA_PROGRAMS) test-list.txt AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) $(DEBUG_CFLAGS)\ -I$(srcdir)/.. \