This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb] MIPS/GAS/testsuite: Deduplicate error lists of branch local tests
- From: Maciej W.Rozycki <macro at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 30 Aug 2017 11:21:46 -0000
- Subject: [binutils-gdb] MIPS/GAS/testsuite: Deduplicate error lists of branch local tests
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=e491e58adce317f8ed46aa7a15dc563131996c50
commit e491e58adce317f8ed46aa7a15dc563131996c50
Author: Maciej W. Rozycki <macro@imgtec.com>
Date: Wed Aug 30 12:20:53 2017 +0100
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:
---
gas/ChangeLog | 13 +++++++++++++
gas/testsuite/gas/mips/branch-local-n32-2.d | 2 +-
gas/testsuite/gas/mips/branch-local-n32-2.l | 5 -----
gas/testsuite/gas/mips/branch-local-n32-3.d | 2 +-
gas/testsuite/gas/mips/branch-local-n32-3.l | 3 ---
gas/testsuite/gas/mips/branch-local-n64-2.d | 2 +-
gas/testsuite/gas/mips/branch-local-n64-2.l | 5 -----
gas/testsuite/gas/mips/branch-local-n64-3.d | 2 +-
gas/testsuite/gas/mips/branch-local-n64-3.l | 3 ---
9 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3e250d3..2e60e29 100644
--- 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 53b76f4..025a12c 100644
--- 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
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 8ef63ef..9d84b80 100644
--- 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
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 b14b1bd..46c48ff 100644
--- 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
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 e12f153..f588bea 100644
--- 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
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