gas run_dump_test rename not-target and not-skip

[deliverable/binutils-gdb.git] / gas / testsuite / lib / gas-defs.exp

diff --git a/gas/testsuite/lib/gas-defs.exp b/gas/testsuite/lib/gas-defs.exp
index b7cc06edef53236d428a67a8ab4eccff93204c37..e040e947a97811a0e7fb6be8332ae77e7c37b7a4 100644 (file)
--- a/gas/testsuite/lib/gas-defs.exp
+++ b/gas/testsuite/lib/gas-defs.exp
@@ -391,7 +391,7 @@ proc run_dump_tests { testcases {extra_options {}} } {
 #      of them, the test will be run, otherwise it will be marked
 #      unsupported.
 #
-#   not-target: GLOB|PROC ...
+#   notarget: GLOB|PROC ...
 #      Do not run this test on a specified list of targets.  Again, each
 #      glob in the space-separated list is passed to "istarget" and each
 #      proc is called as a TCL procedure, and the test is run if it
@@ -399,8 +399,8 @@ proc run_dump_tests { testcases {extra_options {}} } {
 #      unsupported.
 #
 #   skip: GLOB|PROC ...
-#   not-skip: GLOB|PROC ...
-#       These are exactly the same as "not-target" and "target",
+#   noskip: GLOB|PROC ...
+#       These are exactly the same as "notarget" and "target",
 #       respectively, except that they do nothing at all if the check
 #       fails.  They should only be used in groups, to construct a single
 #       test which is run on all targets but with variant options or
@@ -474,9 +474,9 @@ proc run_dump_test { name {extra_options {}} } {
     set opts(error-output) {}
     set opts(warning) {}
     set opts(target) {}
-    set opts(not-target) {}
+    set opts(notarget) {}
     set opts(skip) {}
-    set opts(not-skip) {}
+    set opts(noskip) {}
     set opts(xfail) {}
     set opts(section-subst) {}
 
@@ -572,11 +572,11 @@ proc run_dump_test { name {extra_options {}} } {
     }
 
     # Handle skipping the test on specified targets.
-    # You can have both skip/not-skip and target/not-target, but you can't
-    # have both skip and not-skip, or target and not-target, in the same file.
+    # You can have both skip/noskip and target/notarget, but you can't
+    # have both skip and noskip, or target and notarget, in the same file.
     if { $opts(skip) != "" } then {
-       if { $opts(not-skip) != "" } then {
-           perror "$testname: mixing skip and not-skip directives is invalid"
+       if { $opts(noskip) != "" } then {
+           perror "$testname: mixing skip and noskip directives is invalid"
            unresolved $testname
            return
        }
@@ -584,9 +584,9 @@ proc run_dump_test { name {extra_options {}} } {
            if {[match_target $glob]} { return }
        }
     }
-    if { $opts(not-skip) != "" } then {
+    if { $opts(noskip) != "" } then {
        set skip 1
-       foreach glob $opts(not-skip) {
+       foreach glob $opts(noskip) {
            if {[match_target $glob]} {
                set skip 0
                break
@@ -595,8 +595,8 @@ 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"
+       if { $opts(notarget) != "" } then {
+           perror "$testname: mixing target and notarget directives is invalid"
            unresolved $testname
            return
        }
@@ -612,8 +612,8 @@ proc run_dump_test { name {extra_options {}} } {
            return
        }
     }
-    if { $opts(not-target) != "" } then {
-       foreach glob $opts(not-target) {
+    if { $opts(notarget) != "" } then {
+       foreach glob $opts(notarget) {
            if {[match_target $glob]} {
                unsupported $testname
                return