From patchwork Mon Nov 3 11:31:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Wood X-Patchwork-Id: 5216341 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2C85FC11AC for ; Mon, 3 Nov 2014 11:31:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6248F20117 for ; Mon, 3 Nov 2014 11:31:10 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 4795F2010F for ; Mon, 3 Nov 2014 11:31:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C41EE6E4F7; Mon, 3 Nov 2014 03:31:08 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com [74.125.82.45]) by gabe.freedesktop.org (Postfix) with ESMTP id 2A4366E4F7 for ; Mon, 3 Nov 2014 03:31:07 -0800 (PST) Received: by mail-wg0-f45.google.com with SMTP id x12so12250425wgg.4 for ; Mon, 03 Nov 2014 03:31:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=AClqEYOeJW8j7cCgS1T2HVy1E+IBoeYtcreLwIwZH4M=; b=lOD8HHz0DpcrLiIc5jsmBRCo5TlWoLPnQNFYcLW67Z4Z2RHk9rJ6E5lNCgEotCNlla 5fCGOFzdKwBKI8W38XD/uo01uOHpRpFhNS1lhZbM2EP5IzkqleLbG1ZOKo2mdgNWp2vk wpvUCym8fng1S8D84MisM7RVm0hBvpYTOj4vSrx62HmhSqlfrnVoaa0exkVFFSztgipM NiyjPYpl9swvx6muRAYBv3BumFSHDMQphRtw1hvwbmn2PUCj/TnYSx7O/tKvjZYumdAt aiR85n3JrYsZLXYSnbezb4tYqMFIr+9YKF5XMkhu032t9xoCrjI4tGAeIiVLzoaJsLtQ K9gA== X-Gm-Message-State: ALoCoQlE9g2vg11OBrsgKbB2+ifH5EU7xgMXZS+YUeo00ZtUVaM4huCcdMrNRKjGxroIo9uOCT6k X-Received: by 10.180.75.116 with SMTP id b20mr15220885wiw.49.1415014266330; Mon, 03 Nov 2014 03:31:06 -0800 (PST) Received: from pistachio.icx.intel.com ([83.217.123.106]) by mx.google.com with ESMTPSA id p3sm21845688wjf.49.2014.11.03.03.31.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Nov 2014 03:31:05 -0800 (PST) From: Thomas Wood To: intel-gfx@lists.freedesktop.org Date: Mon, 3 Nov 2014 11:31:01 +0000 Message-Id: <1415014265-858-1-git-send-email-thomas.wood@intel.com> X-Mailer: git-send-email 2.1.0 Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH i-g-t 1/5] lib/tests: fix tests and test list location 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.8 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 The igt_command_line.sh script was moved by commit 685e577 (Move library selftests to lib/tests), but the location of the tests and the test lists was not updated. Cc: Daniel Vetter Signed-off-by: Thomas Wood --- lib/tests/Makefile.am | 4 ++++ lib/tests/igt_command_line.sh | 18 ++++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am index 78279fb..bab0fcb 100644 --- a/lib/tests/Makefile.am +++ b/lib/tests/Makefile.am @@ -1,5 +1,9 @@ include Makefile.sources +AM_TESTS_ENVIRONMENT = \ + top_builddir=$(top_builddir) \ + top_srcdir=$(top_srcdir) + EXTRA_DIST = $(check_SCRIPTS) AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) \ diff --git a/lib/tests/igt_command_line.sh b/lib/tests/igt_command_line.sh index 075f1d5..7e6ca67 100755 --- a/lib/tests/igt_command_line.sh +++ b/lib/tests/igt_command_line.sh @@ -25,17 +25,23 @@ # Check that command line handling works consistently across all tests # -for test in `cat single-tests.txt multi-tests.txt`; do +TESTLIST=`cat $top_builddir/tests/single-tests.txt $top_builddir/tests/multi-tests.txt` +if [ $? -ne 0 ]; then + echo "Error: Could not read test lists" + exit 99 +fi + +for test in $TESTLIST; do if [ "$test" = "TESTLIST" -o "$test" = "END" ]; then continue fi - # if the test is a script, it will be in $srcdir - if [ ! -x $test ]; then - if [ -x $srcdir/$test ]; then - test=$srcdir/$test - fi + if [ -x $top_builddir/tests/$test ]; then + test=$top_builddir/tests/$test + else + # if the test is a script, it will be in $srcdir + test=$top_srcdir/tests/$test fi echo "$test:"