From patchwork Thu Mar 26 16:05:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joonas Lahtinen X-Patchwork-Id: 6100701 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 E4DF0BF90F for ; Thu, 26 Mar 2015 16:05:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0AB0E20411 for ; Thu, 26 Mar 2015 16:05:34 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id D9B87203EC for ; Thu, 26 Mar 2015 16:05:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 455066EA39; Thu, 26 Mar 2015 09:05:31 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id 4C5C76EA39 for ; Thu, 26 Mar 2015 09:05:30 -0700 (PDT) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 26 Mar 2015 09:05:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,473,1422950400"; d="scan'208";a="704623933" Received: from rgunnin1-mobl1.ger.corp.intel.com (HELO [10.252.11.137]) ([10.252.11.137]) by orsmga002.jf.intel.com with ESMTP; 26 Mar 2015 09:05:29 -0700 Message-ID: <1427385927.25724.1.camel@jlahtine-mobl1> From: Joonas Lahtinen To: Thomas Wood Date: Thu, 26 Mar 2015 18:05:27 +0200 In-Reply-To: References: <1427280184.8586.0.camel@jlahtine-mobl1> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo X-Mailer: Evolution 3.10.4 (3.10.4-4.fc20) Mime-Version: 1.0 Cc: Intel Graphics Development Subject: [Intel-gfx] [PATCH i-g-t v2] tests: install test programs to libexec 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: , 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 Install the test programs by default so that they can be packaged. v2: - Install more tests including scripts and their data Signed-off-by: Joonas Lahtinen --- tests/Makefile.am | 22 +++++++++++++++++++--- tests/Makefile.sources | 10 ++++++++-- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 0ae2541..12675b5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -27,10 +27,26 @@ multi-tests.txt: Makefile.sources @echo ${multi_kernel_tests} >> $@ @echo END TESTLIST >> $@ -EXTRA_PROGRAMS = $(TESTS_progs) $(TESTS_progs_M) $(HANG) -EXTRA_DIST = $(TESTS_scripts) $(TESTS_scripts_M) $(scripts) $(IMAGES) $(common_files) +libexec_PROGRAMS += \ + $(TESTS_progs) \ + $(TESTS_progs_M) \ + $(HANG) \ + $(NULL) + +libexec_SCRIPTS += \ + $(TESTS_scripts) \ + $(TESTS_scripts_M) \ + $(scripts) \ + $(NULL) + +# We do want the data to be at the same directory as executables. +igt_tests_datadir = $(libexecdir) +igt_tests_data_DATA = \ + $(IMAGES) \ + $(common_files) \ + $(NULL) -CLEANFILES = $(EXTRA_PROGRAMS) single-tests.txt multi-tests.txt +CLEANFILES = single-tests.txt multi-tests.txt AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) \ -I$(srcdir)/.. \ diff --git a/tests/Makefile.sources b/tests/Makefile.sources index 0a974a6..8d4e243 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -1,12 +1,18 @@ noinst_PROGRAMS = \ gem_alive \ gem_stress \ - $(TESTS_progs) \ - $(TESTS_progs_M) \ $(HANG) \ $(TESTS_testsuite) \ $(NULL) +libexec_PROGRAMS = \ + $(TESTS_progs) \ + $(TESTS_progs_M) \ + $(NULL) + +libexec_SCRIPTS = \ + $(NULL) + NOUVEAU_TESTS_M = \ prime_nv_api \ prime_nv_pcopy \