From patchwork Thu May 14 17:11:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Baker X-Patchwork-Id: 48533 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D591421411 for ; Thu, 14 May 2015 17:12:20 +0000 (UTC) Received: by laat2 with SMTP id t2sf22260351laa.2 for ; Thu, 14 May 2015 10:12:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:mime-version:in-reply-to:references :date:message-id:subject:from:to:cc:content-type:sender:precedence :list-id:x-original-sender:x-original-authentication-results :mailing-list:list-post:list-help:list-archive:list-unsubscribe; bh=KXzBlzbHPyMTxWdxXSCUe1t650/xUOwD8SNQ9yMcnY0=; b=YPn0M76yXbshOSohj+5971Vrz3p/BK4dnz4Rwf9WnO32OaH9cRUir6Jwgec7tRCovg T7J7D3fM/7/GFxbdoxPOuyGvy63/XNXdllwdmYMbkEKy7lzo+Spu5SR5vXmQn7Fl7lj9 q/AmO8oSLNbs1HYOQ/KPNl2FCjR2GaizB6/lrfr8pKzCVvUlwvhNKd20FkTr5e/wS4oq 8XPWeRHnWGWWv4tnkHitpoFhMeT4YfVSLUbvUg132csIS3wUpgwtomhTkunDGkFqjXTu /wJKxvad0PQ/+9Th2DUu1rvO6uyPUjcFgMoZFxTbCzelHSdAIqqZ8k8i020bqmYrnS3S 7K9Q== X-Gm-Message-State: ALoCoQnj2QRZKUhsnnPpI0bfGh+bOJ21EG362gTXYpnSari+99U80J2wWCaCRHkzQwgaX6NRsZ7x X-Received: by 10.194.236.230 with SMTP id ux6mr3691725wjc.5.1431623539797; Thu, 14 May 2015 10:12:19 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.44.135 with SMTP id e7ls485837lam.79.gmail; Thu, 14 May 2015 10:12:19 -0700 (PDT) X-Received: by 10.152.184.101 with SMTP id et5mr3940944lac.43.1431623539544; Thu, 14 May 2015 10:12:19 -0700 (PDT) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id h2si14920630lag.151.2015.05.14.10.12.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 May 2015 10:12:19 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by layy10 with SMTP id y10so77159402lay.0 for ; Thu, 14 May 2015 10:12:19 -0700 (PDT) X-Received: by 10.112.182.4 with SMTP id ea4mr4047353lbc.35.1431623539386; Thu, 14 May 2015 10:12:19 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp1410226lbb; Thu, 14 May 2015 10:12:17 -0700 (PDT) X-Received: by 10.70.130.198 with SMTP id og6mr9791338pdb.153.1431623533793; Thu, 14 May 2015 10:12:13 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id zn2si33258088pbc.102.2015.05.14.10.12.12; Thu, 14 May 2015 10:12:13 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933849AbbENRL6 (ORCPT + 28 others); Thu, 14 May 2015 13:11:58 -0400 Received: from mail-vn0-f51.google.com ([209.85.216.51]:35444 "EHLO mail-vn0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933155AbbENRLx (ORCPT ); Thu, 14 May 2015 13:11:53 -0400 Received: by vnbg1 with SMTP id g1so5625671vnb.2 for ; Thu, 14 May 2015 10:11:52 -0700 (PDT) MIME-Version: 1.0 X-Received: by 10.52.26.132 with SMTP id l4mr4730478vdg.72.1431623512106; Thu, 14 May 2015 10:11:52 -0700 (PDT) Received: by 10.52.135.114 with HTTP; Thu, 14 May 2015 10:11:52 -0700 (PDT) In-Reply-To: <5554BED4.9040204@osg.samsung.com> References: <1431467947-29847-1-git-send-email-tyler.baker@linaro.org> <1431467947-29847-3-git-send-email-tyler.baker@linaro.org> <5553C51B.6080504@osg.samsung.com> <5554BED4.9040204@osg.samsung.com> Date: Thu, 14 May 2015 10:11:52 -0700 Message-ID: Subject: Re: [PATCH 2/2] selftests/breakpoints: only set TEST_PROGS when built From: Tyler Baker To: Shuah Khan Cc: Andy Lutomirski , Kevin Hilman , John Stultz , Darren Hart , Michael Ellerman , David Herrmann , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: tyler.baker@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , On 14 May 2015 at 08:27, Shuah Khan wrote: > On 05/14/2015 08:15 AM, Tyler Baker wrote: >> On 13 May 2015 at 14:41, Shuah Khan wrote: >>> On 05/12/2015 03:59 PM, tyler.baker@linaro.org wrote: >>>> From: Tyler Baker >>>> >>>> Set TEST_PROGS only when a build has occurred. >>>> >>>> Signed-off-by: Tyler Baker >>>> --- >>>> tools/testing/selftests/breakpoints/Makefile | 3 +-- >>>> 1 file changed, 1 insertion(+), 2 deletions(-) >>>> >>>> diff --git a/tools/testing/selftests/breakpoints/Makefile b/tools/testing/selftests/breakpoints/Makefile >>>> index 1822356..54cc3e7 100644 >>>> --- a/tools/testing/selftests/breakpoints/Makefile >>>> +++ b/tools/testing/selftests/breakpoints/Makefile >>>> @@ -12,12 +12,11 @@ endif >>>> all: >>>> ifeq ($(ARCH),x86) >>>> gcc breakpoint_test.c -o breakpoint_test >>>> + TEST_PROGS := breakpoint_test >>>> else >>>> echo "Not an x86 target, can't build breakpoints selftests" >>>> endif >>>> >>>> -TEST_PROGS := breakpoint_test >>>> - >>>> include ../lib.mk >>>> >>>> clean: >>>> >>> >>> Hmm. With this change install fails to copy breakpoint_test all >>> together. Remember setting TEST_PROGS in compile step makes it >>> not stick around when install target is called. A better approach >>> would be the following: >>> >>> if [ -f breakpoint_test ] >>> TEST_PROGS := breakpoint_test >>> fi >> >> Thanks for pointing this out, this is a good catch. We will also need >> to do this for the x86 tests IIRC. Would it make more sense to have >> this check performed in the INSTALL_RULE so that we don't have to have >> a bunch of IF statements in the various Makefiles? > > Right. x86 will need this type of logic for 32-bit execs when they > aren't not built on a 64-bit system, and for 64-bit execs when they > aren't built on a 32-bit system. Considering the change below we can now simplify this case for x86 to: If the binaries do not exist, they will be not be installed. If you and Andy are ok with this, I'll add a patch to this series. > >> >> Something like... >> >> @for ARTIFACT in $(TEST_PROGS) $(TEST_PROGS_EXTENDED) $(TEST_FILES); do \ >> if [ -f $$ARTIFACT ]; then \ >> install -t $(INSTALL_PATH) $$ARTIFACT; \ >> fi; \ >> done; >> > > I think it makes perfect sense to do this in INSTALL_RULE. > As you said, this will avoid changes to test individual > Makefiles and new test writers don't have to worry about > adding this. > > Would you like make the necessary changes? Sure, I'll add this in the next revision. > > thanks, > -- Shuah > > > -- > Shuah Khan > Sr. Linux Kernel Developer > Open Source Innovation Group > Samsung Research America (Silicon Valley) > shuahkh@osg.samsung.com | (970) 217-8978 Cheers, Tyler --- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ diff --git a/tools/testing/selftests/x86/Makefile b/tools/testing/selftests/x86/Makefile index 12d8e76..3e238d0 100644 --- a/tools/testing/selftests/x86/Makefile +++ b/tools/testing/selftests/x86/Makefile @@ -14,13 +14,9 @@ UNAME_M := $(shell uname -m) ifeq ($(CROSS_COMPILE),) # Always build 32-bit tests all: all_32 -# Install 32-bit tests -TEST_PROGS += $(BINARIES_32) run_x86_tests.sh # If we're on a 64-bit host, build 64-bit tests as well ifeq ($(UNAME_M),x86_64) all: all_64 -# Install 64-bit tests -TEST_PROGS += $(BINARIES_64) endif endif @@ -28,6 +24,9 @@ all_32: check_build32 $(BINARIES_32) all_64: $(BINARIES_64) +# Install the tests +TEST_PROGS := $(BINARIES_32) $(BINARIES_64) run_x86_tests.sh + include ../lib.mk clean: