MIPS/GAS/testsuite: Deduplicate error lists of branch local tests

Complement commit 7795a8f8bdde ("MIPS/GAS/testsuite: Convert branch
local list tests to dump tests") and share identical error lists among
branch local tests, removing duplicate copies.

	gas/
	* testsuite/gas/mips/branch-local-n32-2.d: Use `branch-local-2.l'
	for `error-output'.
	* testsuite/gas/mips/branch-local-n64-2.d: Likewise.
	* testsuite/gas/mips/branch-local-n32-3.d: Use `branch-local-3.l'
	for `error-output'.
	* testsuite/gas/mips/branch-local-n64-3.d: Likewise.
	* testsuite/gas/mips/branch-local-n32-2.l: Remove file.
	* testsuite/gas/mips/branch-local-n64-2.l: Remove file.
	* testsuite/gas/mips/branch-local-n32-3.l: Remove file.
	* testsuite/gas/mips/branch-local-n64-3.l: Remove file.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3e250d3d93295e3c8e9074a85d43cdb1d70fffe6..2e60e29a3c6d369d7843f92a71c3277a7664a88b 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,16 @@
+2017-08-30  Maciej W. Rozycki  <macro@imgtec.com>
+
+       * testsuite/gas/mips/branch-local-n32-2.d: Use `branch-local-2.l'
+       for `error-output'.
+       * testsuite/gas/mips/branch-local-n64-2.d: Likewise.
+       * testsuite/gas/mips/branch-local-n32-3.d: Use `branch-local-3.l'
+       for `error-output'.
+       * testsuite/gas/mips/branch-local-n64-3.d: Likewise.
+       * testsuite/gas/mips/branch-local-n32-2.l: Remove file.
+       * testsuite/gas/mips/branch-local-n64-2.l: Remove file.
+       * testsuite/gas/mips/branch-local-n32-3.l: Remove file.
+       * testsuite/gas/mips/branch-local-n64-3.l: Remove file.
+
 2017-08-29  Jozef Lawrynowicz  <jozef.l@somniumtech.com>
 
        * config/tc-msp430.c (md_parse_option): Define high data and high

diff --git a/gas/testsuite/gas/mips/branch-local-n32-2.d b/gas/testsuite/gas/mips/branch-local-n32-2.d
index 53b76f4d8ff762cf3b937b9508421b1bc1054f4c..025a12ce49b52071b4f1e143255cf5e15aacfd3a 100644 (file)
--- a/gas/testsuite/gas/mips/branch-local-n32-2.d
+++ b/gas/testsuite/gas/mips/branch-local-n32-2.d
@@ -1,3 +1,3 @@
 #name: MIPS branch local symbol relocation 2 (n32)
 #as: -n32 -march=from-abi
-#error-output: branch-local-n32-2.l
+#error-output: branch-local-2.l

diff --git a/gas/testsuite/gas/mips/branch-local-n32-2.l b/gas/testsuite/gas/mips/branch-local-n32-2.l
deleted file mode 100644 (file)
index 4f93bf3..0000000
--- a/gas/testsuite/gas/mips/branch-local-n32-2.l
+++ /dev/null
@@ -1,5 +0,0 @@
-.*: Assembler messages:
-.*:19: Error: branch to a symbol in another ISA mode
-.*:21: Error: branch to a symbol in another ISA mode
-.*:23: Error: branch to a symbol in another ISA mode
-.*:25: Error: branch to a symbol in another ISA mode

diff --git a/gas/testsuite/gas/mips/branch-local-n32-3.d b/gas/testsuite/gas/mips/branch-local-n32-3.d
index 8ef63ef11f5a6b66115af853889f7c385049ffbb..9d84b80634ee8f332f00a813f879deeba04addf5 100644 (file)
--- a/gas/testsuite/gas/mips/branch-local-n32-3.d
+++ b/gas/testsuite/gas/mips/branch-local-n32-3.d
@@ -1,3 +1,3 @@
 #name: MIPS branch local symbol relocation 3 (n32)
 #as: -n32 -march=from-abi
-#error-output: branch-local-n32-3.l
+#error-output: branch-local-3.l

diff --git a/gas/testsuite/gas/mips/branch-local-n32-3.l b/gas/testsuite/gas/mips/branch-local-n32-3.l
deleted file mode 100644 (file)
index 39fb31f..0000000
--- a/gas/testsuite/gas/mips/branch-local-n32-3.l
+++ /dev/null
@@ -1,3 +0,0 @@
-.*: Assembler messages:
-.*:20: Error: branch to a symbol in another ISA mode
-.*:22: Error: branch to a symbol in another ISA mode

diff --git a/gas/testsuite/gas/mips/branch-local-n64-2.d b/gas/testsuite/gas/mips/branch-local-n64-2.d
index b14b1bd32faf328d2c39536071898baaee03b9e2..46c48ffb347e31bd84d83581eb29bc9db81706f0 100644 (file)
--- a/gas/testsuite/gas/mips/branch-local-n64-2.d
+++ b/gas/testsuite/gas/mips/branch-local-n64-2.d
@@ -1,3 +1,3 @@
 #name: MIPS branch local symbol relocation 2 (n64)
 #as: -64 -march=from-abi
-#error-output: branch-local-n64-2.l
+#error-output: branch-local-2.l

diff --git a/gas/testsuite/gas/mips/branch-local-n64-2.l b/gas/testsuite/gas/mips/branch-local-n64-2.l
deleted file mode 100644 (file)
index 4f93bf3..0000000
--- a/gas/testsuite/gas/mips/branch-local-n64-2.l
+++ /dev/null
@@ -1,5 +0,0 @@
-.*: Assembler messages:
-.*:19: Error: branch to a symbol in another ISA mode
-.*:21: Error: branch to a symbol in another ISA mode
-.*:23: Error: branch to a symbol in another ISA mode
-.*:25: Error: branch to a symbol in another ISA mode

diff --git a/gas/testsuite/gas/mips/branch-local-n64-3.d b/gas/testsuite/gas/mips/branch-local-n64-3.d
index e12f1537e5c8f92ef9b2e237945fff4721f0da5c..f588beaef36622a0be838c8c2618035c210ac213 100644 (file)
--- a/gas/testsuite/gas/mips/branch-local-n64-3.d
+++ b/gas/testsuite/gas/mips/branch-local-n64-3.d
@@ -1,3 +1,3 @@
 #name: MIPS branch local symbol relocation 3 (n64)
 #as: -64 -march=from-abi
-#error-output: branch-local-n64-3.l
+#error-output: branch-local-3.l

diff --git a/gas/testsuite/gas/mips/branch-local-n64-3.l b/gas/testsuite/gas/mips/branch-local-n64-3.l
deleted file mode 100644 (file)
index 39fb31f..0000000
--- a/gas/testsuite/gas/mips/branch-local-n64-3.l
+++ /dev/null
@@ -1,3 +0,0 @@
-.*: Assembler messages:
-.*:20: Error: branch to a symbol in another ISA mode
-.*:22: Error: branch to a symbol in another ISA mode