From patchwork Tue May 13 08:34:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tim.gore@intel.com X-Patchwork-Id: 4163311 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A43409F271 for ; Tue, 13 May 2014 08:34:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D759B20254 for ; Tue, 13 May 2014 08:34:47 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id D56B02024C for ; Tue, 13 May 2014 08:34:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 461176E5F3; Tue, 13 May 2014 01:34:46 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 79EA66E5F3 for ; Tue, 13 May 2014 01:34:44 -0700 (PDT) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 13 May 2014 01:34:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="4.97,1042,1389772800"; d="scan'208"; a="539471550" Received: from tgore-linux.iwi.intel.com ([172.28.253.39]) by orsmga002.jf.intel.com with ESMTP; 13 May 2014 01:34:43 -0700 From: tim.gore@intel.com To: intel-gfx@lists.freedesktop.org Date: Tue, 13 May 2014 09:34:42 +0100 Message-Id: <1399970082-1680-1-git-send-email-tim.gore@intel.com> X-Mailer: git-send-email 1.9.2 Subject: [Intel-gfx] [PATCH] intel-gpu-tools: Move igt tests to intel validation area X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 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 From: Tim Gore Currently when IGT is built for Android the resulting test executables go to /system/bin, which is not ideal. After discussion with the core validation team i have moved them to /system/vendor/intel/validation/core/igt by setting LOCAL_MODULE_PATH. I have also added a --defsym linker option to export a symbol that allows a script to easily distinguish between tests that have subtests and those that dont. There are better ways to do this (viz, in the source code) but because the igt tests are not written consistently this would require many more changes. Signed-off-by: Tim Gore --- tests/Android.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/Android.mk b/tests/Android.mk index db4a4aa..ad61ab8 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -18,6 +18,9 @@ define add_test LOCAL_SHARED_LIBRARIES := ${IGT_LOCAL_SHARED_LIBRARIES} LOCAL_MODULE_TAGS := optional + # ask linker to define a specific symbol; we use this to identify IGT tests + LOCAL_LDFLAGS := -Wl,--defsym=$2=0 + LOCAL_MODULE_PATH := $(ANDROID_PRODUCT_OUT)/$(TARGET_COPY_OUT_VENDOR)/intel/validation/core/igt include $(BUILD_EXECUTABLE) endef @@ -68,7 +71,10 @@ else IGT_LOCAL_CFLAGS += -DANDROID_HAS_CAIRO=0 endif -tests_list := $(filter-out $(skip_tests_list),$(TESTS_progs) $(TESTS_progs_M) $(HANG) $(TESTS_testsuite)) +# create two test lists, one for simple single tests, one for tests that have subtests +tests_list := $(filter-out $(skip_tests_list),$(TESTS_progs) $(HANG) $(TESTS_testsuite)) +tests_list_M := $(filter-out $(skip_tests_list),$(TESTS_progs_M)) -$(foreach item,$(tests_list),$(eval $(call add_test,$(item)))) +$(foreach item,$(tests_list),$(eval $(call add_test,$(item),"IGT_SINGLE_TEST"))) +$(foreach item,$(tests_list_M),$(eval $(call add_test,$(item),"IGT_MULTI_TEST")))