From patchwork Fri Aug 25 10:13:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petri Latvala X-Patchwork-Id: 9921651 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6BD396022E for ; Fri, 25 Aug 2017 10:14:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 587D527E5A for ; Fri, 25 Aug 2017 10:14:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4BDB427EE2; Fri, 25 Aug 2017 10:14:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.7 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0B16627E5A for ; Fri, 25 Aug 2017 10:14:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AE0CC6E834; Fri, 25 Aug 2017 10:14:03 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from johanna3.inet.fi (mta-out1.inet.fi [62.71.2.233]) by gabe.freedesktop.org (Postfix) with ESMTP id 20FDF6E828 for ; Fri, 25 Aug 2017 10:13:59 +0000 (UTC) RazorGate-KAS: Status: not_detected RazorGate-KAS: Rate: 0 RazorGate-KAS: Envelope from: RazorGate-KAS: Version: 5.5.3 RazorGate-KAS: LuaCore: 80 2014-11-10_18-01-23 260f8afb9361da3c7edfd3a8e3a4ca908191ad29 RazorGate-KAS: Lua profiles 69136 [Nov 12 2014] RazorGate-KAS: Method: none Received: from hufflepuff.adrinael.net (84.248.197.237) by johanna3.inet.fi (9.0.002.03-2-gbe5d057) id 5994103100FF3F02; Fri, 25 Aug 2017 13:13:58 +0300 Received: from adrinael by hufflepuff.adrinael.net with local (Exim 4.84_2) (envelope-from ) id 1dlBck-00064O-Ts; Fri, 25 Aug 2017 13:13:58 +0300 From: Petri Latvala To: intel-gfx@lists.freedesktop.org Date: Fri, 25 Aug 2017 13:13:51 +0300 Message-Id: <1503656032-23100-2-git-send-email-petri.latvala@intel.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1503656032-23100-1-git-send-email-petri.latvala@intel.com> References: <1503656032-23100-1-git-send-email-petri.latvala@intel.com> Cc: Tomi Sarvela Subject: [Intel-gfx] [PATCH i-g-t 1/2] tests/Makefile.am: Install test-list*.txt to libexecdir 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-Virus-Scanned: ClamAV using ClamSMTP Piglit expects test-list*.txt files to be in the same directory as the test binaries. Installing non-executable files to libexecdir requires going around some of autotools' sanity checks. This change should make 'make install':ed IGT runnable with piglit. Signed-off-by: Petri Latvala Cc: Tomi Sarvela Cc: Arkadiusz Hiler --- tests/Makefile.am | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 726e2b2..b96e96a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -50,6 +50,16 @@ pkglibexec_PROGRAMS = \ $(TESTS_progs_X) \ $(NULL) +# Piglit expects test-list*.txt to be in the same directory as the +# tests. pkglibexec_DATA is an invalid combo to autotools, so work +# around that by defining a new directory variable that is the same as +# libexec directory and install the .txt files there. +wrap_libexecdir = $(pkglibexecdir) +wrap_libexec_DATA = \ + test-list.txt \ + test-list-full.txt \ + $(NULL) + dist_pkglibexec_SCRIPTS = \ $(TESTS_scripts) \ $(scripts) \ @@ -63,8 +73,6 @@ all-local: .gitignore .gitignore: Makefile.sources @echo "$(pkglibexec_PROGRAMS) $(HANG) test-list.txt test-list-full.txt /.gitignore" | sed 's/\s\+/\n/g' | sort > $@ -pkgdata_DATA = test-list.txt test-list-full.txt - EXTRA_PROGRAMS = $(HANG) EXTRA_DIST = $(common_files) $(check_SCRIPTS)