From e83c417475ba1a0a4b0ef81c99382ac78dfde7f1 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 11 May 2015 12:29:27 -0700 Subject: [PATCH] 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. --- 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 43461adf08e..22bd68011b5 100644 --- a/binutils/testsuite/ChangeLog +++ b/binutils/testsuite/ChangeLog @@ -1,3 +1,9 @@ +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. diff --git a/binutils/testsuite/binutils-all/elfedit-1.d b/binutils/testsuite/binutils-all/elfedit-1.d index 700d54281b9..7eb8d6a6e2e 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 b366b639ff6..f87b39061f4 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]} { -- 2.30.2