Handle new tests, and new testing modes.

Now gas_test accepts an argument listing options to be tried, individually
or in combination, and whether output should be expected.
Proc gas_test_error says output should be expected.
Still not checking exit status properly, though.

1 files changed, 18 insertions, 13 deletions

diff --git a/gas/testsuite/gas/gas.exp b/gas/testsuite/gas/gas.exp
index bb25e4d..9816cc7 100644
--- a/gas/testsuite/gas/gas.exp
+++ b/gas/testsuite/gas/gas.exp
@@ -9,28 +9,33 @@
 
 gas_init
 
+# List of optional assembler options that are likely to alter the assembler's
+# behavior.  Keep this set small, since its power set generates the list of
+# test cases run.  Suggested: listings (shouldn't affect outcome drastically
+# but does), pic?, ...
+set stdoptlist "-a>"
+
 #
 # Target-independent tests
 #
 
-gas_test "p2425.s" "" "pcrel values in assignment"
-
-gas_test_ignore_stdout "p2425.s" "-al" "pcrel values in assignment, with listing"
+gas_test "p2425.s" "" $stdoptlist "pcrel values in assignment"
 
 #
 # Some m68k-coff tests
 #
 if [istarget m68*-*-coff] then {
-    gas_test "p2430.s" "" "local branch not in text section"
-    gas_test_ignore_stdout "p2430.s" "-al" "local branch not in text section (with listing)"
+    gas_test "p2430.s" "" $stdoptlist "local branch not in text section"
+
+    gas_test "p2430a.s" "" $stdoptlist "local branch not in text section"
 
-    gas_test "t1.s" "" "multiple .file directives"
+    gas_test "t1.s" "" $stdoptlist "multiple .file directives"
 
-    gas_test "p2389.s" "" "bss fill"
-    gas_test_error "p2389a.s" "" "bss fill with non-zero data"
+    gas_test "p2389.s" "" $stdoptlist "bss fill"
+    gas_test_error "p2389a.s" "" "detect bss fill with non-zero data"
 
     if [file exists "$testdir/p2411.s"] then {
-	gas_test "p2411.s" "" "PR 2411"
+	gas_test "p2411.s" "" $stdoptlist "PR 2411"
     }
 }
 
@@ -42,10 +47,10 @@ if [istarget m68*-*-*] then {
     # Operand size dependent on offset computed using operand size
     #
     if [file exists "$testdir/p2425a.s"] then {
-	gas_test "p2425a.s" "" "PR 2425"
+	gas_test "p2425a.s" "" $stdoptlist "PR 2425"
     }
 
-    gas_test "t2.s" "" "cross-section branch"
+    gas_test "t2.s" "" $stdoptlist "cross-section branch"
 }
 
 #
@@ -55,6 +60,6 @@ if [istarget m68*-*-*] then {
 # records.  Verify that we can accept both.
 #
 if [istarget sparc-*-solaris2*] then {
-    gas_test "sol-cc.s"  "" "SPARC Solaris cc -g"
-    gas_test "sol-gcc.s" "" "SPARC Solaris gcc -g"
+    gas_test "sol-cc.s"  "" $stdoptlist "SPARC Solaris cc -g"
+    gas_test "sol-gcc.s" "" $stdoptlist "SPARC Solaris gcc -g"
 }