From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 104250 invoked by alias); 11 May 2015 19:34:48 -0000 Mailing-List: contact binutils-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: binutils-owner@sourceware.org Received: (qmail 104240 invoked by uid 89); 11 May 2015 19:34:47 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.7 required=5.0 tests=AWL,BAYES_20,KAM_LAZY_DOMAIN_SECURITY,NO_DNS_FOR_FROM,T_RP_MATCHES_RCVD autolearn=no version=3.3.2 X-HELO: mga03.intel.com Received: from mga03.intel.com (HELO mga03.intel.com) (134.134.136.65) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 11 May 2015 19:34:46 +0000 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP; 11 May 2015 12:34:27 -0700 X-ExtLoop1: 1 Received: from gnu-6.sc.intel.com ([172.25.70.52]) by orsmga002.jf.intel.com with ESMTP; 11 May 2015 12:34:27 -0700 Received: by gnu-6.sc.intel.com (Postfix, from userid 1000) id 319C7201260; Mon, 11 May 2015 12:34:27 -0700 (PDT) Date: Mon, 11 May 2015 19:34:00 -0000 From: "H.J. Lu" To: binutils@sourceware.org Subject: [committed, PATCH] Allow mixing target and not-target directives Message-ID: <20150511193427.GA939@intel.com> Reply-To: "H.J. Lu" MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-SW-Source: 2015-05/txt/msg00071.txt.bz2 Mixing target and not-target directives can be used to run for x86_64-*-* target while skipping x86_64-*-gnux32 target. This patch allows mixing target and not-target directives. It is used to skip elfedit-1 for x86_64-*-gnux32. * binutils-all/elfedit-1.d: Skip x86_64-*-gnux32. * lib/utils-lib.exp (run_dump_test): Allow mixing target and not-target directives. --- binutils/testsuite/ChangeLog | 6 ++++++ binutils/testsuite/binutils-all/elfedit-1.d | 1 + binutils/testsuite/lib/utils-lib.exp | 5 ----- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog index 43461ad..22bd680 100644 --- a/binutils/testsuite/ChangeLog +++ b/binutils/testsuite/ChangeLog @@ -1,5 +1,11 @@ 2015-05-11 H.J. Lu + * binutils-all/elfedit-1.d: Skip x86_64-*-gnux32. + * lib/utils-lib.exp (run_dump_test): Allow mixing target and + not-target directives. + +2015-05-11 H.J. Lu + * binutils-all/objdump.exp (cpus_expected): Append iamcu. 2015-05-11 H.J. Lu diff --git a/binutils/testsuite/binutils-all/elfedit-1.d b/binutils/testsuite/binutils-all/elfedit-1.d index 700d542..7eb8d6a 100644 --- a/binutils/testsuite/binutils-all/elfedit-1.d +++ b/binutils/testsuite/binutils-all/elfedit-1.d @@ -4,6 +4,7 @@ #readelf: -h #name: Update ELF header 1 #target: x86_64-*-* +#not-target: x86_64-*-gnux32 #... ELF Header: diff --git a/binutils/testsuite/lib/utils-lib.exp b/binutils/testsuite/lib/utils-lib.exp index b366b63..f87b390 100644 --- a/binutils/testsuite/lib/utils-lib.exp +++ b/binutils/testsuite/lib/utils-lib.exp @@ -412,11 +412,6 @@ proc run_dump_test { name {extra_options {}} } { if {$skip} { return } } if { $opts(target) != "" } then { - if { $opts(not-target) != "" } then { - perror "$testname: mixing target and not-target directives is invalid" - unresolved $testname - return - } set skip 1 foreach glob $opts(target) { if {[istarget $glob]} { -- 1.9.3