From 8a8c916960b0e1b00a5d323fc478f4b4ef1072f5 Mon Sep 17 00:00:00 2001
From: "Maciej W. Rozycki" <macro@mips.com>
Date: Mon, 9 Jul 2018 15:50:57 +0100
Subject: [PATCH] LD/testsuite: run_dump_test: Report UNSUPPORTED for excluded
 targets

Bring the LD implementation of `run_dump_test' in line with its binutils
and GAS counterparts and report the UNSUPPORTED status for tests the run
of which has been prevented by means of one or more of `target',
`alltargets' and `notarget' tags.  Define `skip', `anyskip' and `noskip'
tags, which do not report anything for tests that are not run.

The rationale behind this is that we want to have unsupported tests
reported to ensure that they have actually been attempted and have not
been accidentally suppressed.  Then tests which have target-specific
variants that cannot be expressed with a single .d file can make use of
the newly added tags to silently suppress the uninteresting variants.

	ld/
	* testsuite/lib/ld-lib.exp (run_dump_test): Call `unsupported'
	if the target being tested has been excluded by means of one or
	more of `target', `alltargets' and `notarget' tags.  Add support
	for `skip', `anyskip' and `noskip' tags.
---
 ld/ChangeLog                |  7 ++++++
 ld/testsuite/lib/ld-lib.exp | 47 ++++++++++++++++++++++++++++++++++---
 2 files changed, 51 insertions(+), 3 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index d7d094c8b23..c146f5cf937 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2018-07-09  Maciej W. Rozycki  <macro@mips.com>
+
+	* testsuite/lib/ld-lib.exp (run_dump_test): Call `unsupported'
+	if the target being tested has been excluded by means of one or
+	more of `target', `alltargets' and `notarget' tags.  Add support
+	for `skip', `anyskip' and `noskip' tags.
+
 2018-07-09  Maciej W. Rozycki  <macro@mips.com>
 
 	* testsuite/lib/ld-lib.exp (run_dump_test): Move the setting of
diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp
index 9e63e30ddcc..1c313c87517 100644
--- a/ld/testsuite/lib/ld-lib.exp
+++ b/ld/testsuite/lib/ld-lib.exp
@@ -542,19 +542,29 @@ proc ld_link_defsyms {} {
 #	as a TCL procedure if surrounded by square brackets, or passed
 #	to "istarget" if not.
 #	This may occur more than once; the target being tested must match
-#	at least one.
+#	at least one.  Otherwise the test will be marked unsupported.
 #
 #   alltargets: TARGET
 #	Only run the test for TARGET.
 #	The syntax for TARGET is as with 'target'.
 #	This may occur more than once; the target being tested must match
-#	all of them.
+#	all of them.  Otherwise the test will be marked unsupported.
 #
 #   notarget: TARGET
 #	Do not run the test for TARGET.
 #	The syntax for TARGET is as with 'target'.
 #	This may occur more than once; the target being tested must not
-#	match any of them.
+#	match any of them.  Otherwise the test will be marked unsupported.
+#
+#   skip: TARGET
+#   anyskip: TARGET
+#   noskip: TARGET
+#	These are exactly the same as "notarget", "alltargets" 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 expected output on some targets.  (For example, see
+#	gas/arm/inst.d and gas/arm/wince_inst.d.)
 #
 #   error: REGEX
 #	An error with message matching REGEX must be emitted for the test
@@ -632,6 +642,9 @@ proc run_dump_test { name {extra_options {}} } {
     set opts(target) {}
     set opts(alltargets) {}
     set opts(notarget) {}
+    set opts(skip) {}
+    set opts(anyskip) {}
+    set opts(noskip) {}
     set opts(objdump) {}
     set opts(nm) {}
     set opts(objcopy) {}
@@ -662,6 +675,9 @@ proc run_dump_test { name {extra_options {}} } {
 	    target {}
 	    alltargets {}
 	    notarget {}
+	    skip {}
+	    anyskip {}
+	    noskip {}
 	    warning {}
 	    error {}
 	    source {
@@ -753,6 +769,28 @@ proc run_dump_test { name {extra_options {}} } {
     }
 
     # Decide early whether we should run the test for this target.
+    if { [llength $opts(noskip)] > 0 } {
+	set targmatch 0
+	foreach targ $opts(noskip) {
+	    if [match_target $targ] {
+		set targmatch 1
+		break
+	    }
+	}
+	if { $targmatch == 0 } {
+	    return
+	}
+    }
+    foreach targ $opts(anyskip) {
+	if ![match_target $targ] {
+	    return
+	}
+    }
+    foreach targ $opts(skip) {
+	if [match_target $targ] {
+	    return
+	}
+    }
     if { [llength $opts(target)] > 0 } {
 	set targmatch 0
 	foreach targ $opts(target) {
@@ -762,16 +800,19 @@ proc run_dump_test { name {extra_options {}} } {
 	    }
 	}
 	if { $targmatch == 0 } {
+	    unsupported $testname
 	    return
 	}
     }
     foreach targ $opts(alltargets) {
 	if ![match_target $targ] {
+	    unsupported $testname
 	    return
 	}
     }
     foreach targ $opts(notarget) {
 	if [match_target $targ] {
+	    unsupported $testname
 	    return
 	}
     }
-- 
2.30.2