Allow mixing target and not-target directives

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.

diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index 43461ad..22bd680 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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]} {