From patchwork Wed Apr 8 13:56:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Wood X-Patchwork-Id: 6180361 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 4F4AABF4A6 for ; Wed, 8 Apr 2015 13:56:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6F6742014A for ; Wed, 8 Apr 2015 13:56:37 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 8B71320373 for ; Wed, 8 Apr 2015 13:56:36 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 082B26E0F3; Wed, 8 Apr 2015 06:56:36 -0700 (PDT) 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 A8E6B89FDE for ; Wed, 8 Apr 2015 06:56:33 -0700 (PDT) Received: by wgsk9 with SMTP id k9so66540831wgs.3 for ; Wed, 08 Apr 2015 06:56:32 -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:cc:subject:date:message-id:in-reply-to :references; bh=aAGGOYe5fZl6wU5EOjuFVzUFHyT7WNfE7CLpg2UKqwY=; b=dJkUF8vWrZz4hZFgXBYyM1evkqosUhsRVtkNFHy8a7Xl5O9FakSYpGK1P9JXNHiL8A YCTeFOtsW+C95QAYLhMTdX2ADIyYFkt6cykH3nIYmG4axvc4ayys1Q+FpF9GXYoAQWAZ kPIr9xyPrGHeJeYPd8xKp9i6x+UTUhEQnF/XXGv/CLgMcEwqFK3e+qO/t2A28m82OJSL L66irp4Witn/LVhFH/dEQMhqttqFTLxyn6qKS21g4f37e4UrA8dtk33BB0GO3Qg9EDoz 4nw0wGDf3jPUGYtt9Osoghfa4y7mJWwmoWbOzhWhtG4jrIsM70IorYwdTesP5+nJrQpj 6IfA== X-Gm-Message-State: ALoCoQnFVsQD3Mgrrb8wz2GEs5WwEbV0UiNGDNqiK+A/Np8GtEFdy0oYpTqcP2WbLEl90PHHxUV5 X-Received: by 10.180.75.233 with SMTP id f9mr14432838wiw.5.1428501392291; Wed, 08 Apr 2015 06:56:32 -0700 (PDT) Received: from pistachio.icx.intel.com ([83.217.123.106]) by mx.google.com with ESMTPSA id o5sm16215270wia.0.2015.04.08.06.56.31 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Apr 2015 06:56:31 -0700 (PDT) From: Thomas Wood To: intel-gfx@lists.freedesktop.org Date: Wed, 8 Apr 2015 14:56:27 +0100 Message-Id: <1428501387-9043-2-git-send-email-thomas.wood@intel.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1428501387-9043-1-git-send-email-thomas.wood@intel.com> References: <1428501387-9043-1-git-send-email-thomas.wood@intel.com> Subject: [Intel-gfx] [PATCH i-g-t 2/2] tests: use standard install prefix for programs, scripts and data 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 Use the pkglibexec and pkgdata prefixes rather than setting bindir and datadir. This also removes the extra 'tests' directory from within the package libexec and data directories. Cc: Joonas Lahtinen Signed-off-by: Thomas Wood --- tests/Makefile.am | 15 +++++++++++---- tests/Makefile.sources | 15 --------------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index d6de373..dc864f4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -27,18 +27,25 @@ multi-tests.txt: Makefile.sources @echo ${multi_kernel_tests} >> $@ @echo END TESTLIST >> $@ -igt_tests_bin_PROGRAMS += \ +noinst_PROGRAMS = \ + $(HANG) \ + $(TESTS_testsuite) \ + $(NULL) + +pkglibexec_PROGRAMS = \ + gem_alive \ + gem_stress \ $(TESTS_progs) \ $(TESTS_progs_M) \ $(NULL) -dist_igt_tests_bin_SCRIPTS = \ +dist_pkglibexec_SCRIPTS = \ $(TESTS_scripts) \ $(TESTS_scripts_M) \ $(scripts) \ $(NULL) -dist_igt_tests_data_DATA = \ +dist_pkgdata_DATA = \ $(IMAGES) \ $(NULL) @@ -52,7 +59,7 @@ AM_CFLAGS = $(DRM_CFLAGS) $(CWARNFLAGS) $(DEBUG_CFLAGS)\ -I$(srcdir)/../lib \ -include "$(srcdir)/../lib/check-ndebug.h" \ -DIGT_SRCDIR=\""$(abs_srcdir)"\" \ - -DIGT_DATADIR=\""$(igt_tests_datadir)"\" \ + -DIGT_DATADIR=\""$(pkgdatadir)"\" \ $(LIBUNWIND_CFLAGS) \ $(NULL) diff --git a/tests/Makefile.sources b/tests/Makefile.sources index 59a06e9..4bf11bf 100644 --- a/tests/Makefile.sources +++ b/tests/Makefile.sources @@ -1,18 +1,3 @@ -igt_tests_bindir = $(pkglibexecdir)/tests -igt_tests_datadir = $(pkgdatadir)/tests - -noinst_PROGRAMS = \ - $(HANG) \ - $(TESTS_testsuite) \ - $(NULL) - -igt_tests_bin_PROGRAMS = \ - gem_alive \ - gem_stress \ - $(TESTS_progs) \ - $(TESTS_progs_M) \ - $(NULL) - NOUVEAU_TESTS_M = \ prime_nv_api \ prime_nv_pcopy \