[committed, PATCH] Allow mixing target and not-target directives

[committed, PATCH] Allow mixing target and not-target directives

[H.J. Lu]

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  <hongjiu.lu@intel.com>
 
+	* 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  <hongjiu.lu@intel.com>
+
 	* binutils-all/objdump.exp (cpus_expected): Append iamcu.
 
 2015-05-11  H.J. Lu  <hongjiu.lu@intel.com>
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

Re: [committed, PATCH] Allow mixing target and not-target directives

[H.J. Lu]

On Mon, May 11, 2015 at 12:34:27PM -0700, H.J. Lu wrote:
> 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.
> 

We also need to skip x86_64-*-nacl* targets.  Committed.

H.J.
---
From 98624574ea8834b2084eb1f0ca7341feecc7329f Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Tue, 12 May 2015 12:47:27 -0700
Subject: [PATCH 1/2] Also skip x86_64-*-nacl*

	* binutils-all/elfedit-1.d: Also skip x86_64-*-nacl*.
---
 binutils/testsuite/ChangeLog                | 4 ++++
 binutils/testsuite/binutils-all/elfedit-1.d | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index 22bd680..07dad22 100644
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2015-05-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* binutils-all/elfedit-1.d: Also skip x86_64-*-nacl*.
+
 2015-05-11  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* binutils-all/elfedit-1.d: Skip x86_64-*-gnux32.
diff --git a/binutils/testsuite/binutils-all/elfedit-1.d b/binutils/testsuite/binutils-all/elfedit-1.d
index 7eb8d6a..69e0e42 100644
--- a/binutils/testsuite/binutils-all/elfedit-1.d
+++ b/binutils/testsuite/binutils-all/elfedit-1.d
@@ -4,7 +4,7 @@
 #readelf: -h
 #name: Update ELF header 1
 #target: x86_64-*-*
-#not-target: x86_64-*-gnux32
+#not-target: x86_64-*-gnux32 x86_64-*-nacl*
 
 #...
 ELF Header:
-- 
1.9.3