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 43461adf08ebe4a2d6e48eb5404352120dc817d4..22bd68011b558b4fe8171509bcf34776635d70c5 100644 (file)
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+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.

diff --git a/binutils/testsuite/binutils-all/elfedit-1.d b/binutils/testsuite/binutils-all/elfedit-1.d
index 700d54281b93b0a4288dff10054a7a479aea473b..7eb8d6a6e2edbb6ecc0b38da678fd6f66534a654 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 b366b639ff635160c031f7d310ed6fd84e524f0f..f87b39061f4a7d3d6f4a4313d0072fec9a847974 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]} {