MIPS/GAS/testsuite: Drop the `mips16e-' prefix from SAVE/RESTORE tests

In preparation to running these tests against regular MIPS instructions.

	gas/
	* testsuite/gas/mips/mips16e-save.d: Rename to...
	* testsuite/gas/mips/save.d: ... this.
	* testsuite/gas/mips/mips16e-save-err.d: Update the
	`error-output' option and rename to...
	* testsuite/gas/mips/save-err.d: ... this.
	* testsuite/gas/mips/mips16e-save-err.l: Rename to...
	* testsuite/gas/mips/save-err.l: ... this.
	* testsuite/gas/mips/mips16e-save.s: Rename to...
	* testsuite/gas/mips/save.s: ... this.
	* testsuite/gas/mips/mips16e-save-err.s: Rename to...
	* testsuite/gas/mips/save-err.s: ... this.
	* testsuite/gas/mips/mips.exp: Rename `mips16e-save' and
	`mips16e-save-err' invocations to `save' and `save-err'
	respectively and reorder these tests away from MIPS16 tests.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 37d45b8..6a3437b 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,22 @@
 2017-06-27  Maciej W. Rozycki  <macro@imgtec.com>
 
+       * testsuite/gas/mips/mips16e-save.d: Rename to...
+       * testsuite/gas/mips/save.d: ... this.
+       * testsuite/gas/mips/mips16e-save-err.d: Update the
+       `error-output' option and rename to...
+       * testsuite/gas/mips/save-err.d: ... this.
+       * testsuite/gas/mips/mips16e-save-err.l: Rename to...
+       * testsuite/gas/mips/save-err.l: ... this.
+       * testsuite/gas/mips/mips16e-save.s: Rename to...
+       * testsuite/gas/mips/save.s: ... this.
+       * testsuite/gas/mips/mips16e-save-err.s: Rename to...
+       * testsuite/gas/mips/save-err.s: ... this.
+       * testsuite/gas/mips/mips.exp: Rename `mips16e-save' and
+       `mips16e-save-err' invocations to `save' and `save-err'
+       respectively and reorder these tests away from MIPS16 tests.
+
+2017-06-27  Maciej W. Rozycki  <macro@imgtec.com>
+
        * testsuite/gas/mips/mips16e-save.d: Remove `-mmips:isa32
        -mmips:16' from `objdump' flags and `-march=mips32 -mips16' from
        `as' flags.

diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index b978704..2e3b3d5 100644 (file)
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -1376,6 +1376,9 @@ if { [istarget mips*-*-vxworks*] } {
     run_dump_test "mips64-dsp"
     run_dump_test "mips32-mt"
 
+    run_dump_test_arches "save"                [mips_arch_list_matching mips16e-32]
+    run_dump_test_arches "save-err"    [mips_arch_list_matching mips16e-32]
+
     run_dump_test "mips16-dwarf2"
     if $has_newabi {
        run_dump_test "mips16-dwarf2-n32"
@@ -1383,9 +1386,6 @@ if { [istarget mips*-*-vxworks*] } {
     run_dump_test "mips16-stabs"
 
     run_dump_test "mips16e-jrc"
-    run_dump_test_arches "mips16e-save"        [mips_arch_list_matching mips16e-32]
-    run_dump_test_arches "mips16e-save-err" \
-                                       [mips_arch_list_matching mips16e-32]
     run_dump_test "mips16e2-lui"
 
     run_dump_test "mips16-intermix"

diff --git a/gas/testsuite/gas/mips/mips16e-save-err.d b/gas/testsuite/gas/mips/save-err.d
similarity index 56%
rename from gas/testsuite/gas/mips/mips16e-save-err.d
rename to gas/testsuite/gas/mips/save-err.d
index fd6b9ca..c0a45bd 100644 (file)
--- a/gas/testsuite/gas/mips/mips16e-save-err.d
+++ b/gas/testsuite/gas/mips/save-err.d
@@ -1,3 +1,3 @@
 #name: MIPS16e SAVE/RESTORE errors
 #as: -32
-#error-output: mips16e-save-err.l
+#error-output: save-err.l

diff --git a/gas/testsuite/gas/mips/mips16e-save-err.l b/gas/testsuite/gas/mips/save-err.l
similarity index 100%
rename from gas/testsuite/gas/mips/mips16e-save-err.l
rename to gas/testsuite/gas/mips/save-err.l

diff --git a/gas/testsuite/gas/mips/mips16e-save-err.s b/gas/testsuite/gas/mips/save-err.s
similarity index 100%
rename from gas/testsuite/gas/mips/mips16e-save-err.s
rename to gas/testsuite/gas/mips/save-err.s

diff --git a/gas/testsuite/gas/mips/mips16e-save.d b/gas/testsuite/gas/mips/save.d
similarity index 100%
rename from gas/testsuite/gas/mips/mips16e-save.d
rename to gas/testsuite/gas/mips/save.d

diff --git a/gas/testsuite/gas/mips/mips16e-save.s b/gas/testsuite/gas/mips/save.s
similarity index 100%
rename from gas/testsuite/gas/mips/mips16e-save.s
rename to gas/testsuite/gas/mips/save.s