This is the mail archive of the binutils-cvs@sourceware.org mailing list for the binutils project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[binutils-gdb] MIPS/GAS/testsuite: Convert ISA override list tests to dump tests

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=7f401e8417160ba5cdad60a38c8a3cbce395a5c5

commit 7f401e8417160ba5cdad60a38c8a3cbce395a5c5
Author: Maciej W. Rozycki <macro@imgtec.com>
Date:   Wed May 10 20:14:11 2017 +0100

    MIPS/GAS/testsuite: Convert ISA override list tests to dump tests
    
    And remove the zillion duplicate sources.  Also `mips1@isa-override-2.l'
    is the same as `r3000@isa-override-2.l', so remove the latter too, now
    that `r3000@isa-override-2.d' can name a file to match stderr output
    against.
    
    	gas/
    	* testsuite/gas/mips/isa-override-2.d: New test.
    	* testsuite/gas/mips/mips1@isa-override-2.d: New test.
    	* testsuite/gas/mips/r3000@isa-override-2.d: New test.
    	* testsuite/gas/mips/r3900@isa-override-2.d: New test.
    	* testsuite/gas/mips/mips2@isa-override-2.d: New test.
    	* testsuite/gas/mips/mips32@isa-override-2.d: New test.
    	* testsuite/gas/mips/mips32r2@isa-override-2.d: New test.
    	* testsuite/gas/mips/mips32r3@isa-override-2.d: New test.
    	* testsuite/gas/mips/mips32r5@isa-override-2.d: New test.
    	* testsuite/gas/mips/mips32r6@isa-override-2.d: New test.
    	* testsuite/gas/mips/octeon3@isa-override-2.d: New test.
    	* testsuite/gas/mips/r3000@isa-override-2.l: Remove list test.
    	* testsuite/gas/mips/mips1@isa-override-2.s: Remove test source.
    	* testsuite/gas/mips/r3000@isa-override-2.s: Remove test source.
    	* testsuite/gas/mips/r3900@isa-override-2.s: Remove test source.
    	* testsuite/gas/mips/mips2@isa-override-2.s: Remove test source.
    	* testsuite/gas/mips/mips32@isa-override-2.s: Remove test
    	source.
    	* testsuite/gas/mips/mips32r2@isa-override-2.s: Remove test
    	source.
    	* testsuite/gas/mips/mips32r3@isa-override-2.s: Remove test
    	source.
    	* testsuite/gas/mips/mips32r5@isa-override-2.s: Remove test
    	source.
    	* testsuite/gas/mips/mips32r6@isa-override-2.s: Remove test
    	source.
    	* testsuite/gas/mips/octeon3@isa-override-2.s: Remove test
    	source.
    	* gas/testsuite/gas/mips/mips.exp: Fold corresponding list tests
    	into the new tests.

Diff:
---
 gas/ChangeLog                                    | 33 ++++++++++++++++++++++++
 gas/testsuite/gas/mips/isa-override-2.d          |  4 +++
 gas/testsuite/gas/mips/mips.exp                  |  2 +-
 gas/testsuite/gas/mips/mips1@isa-override-2.d    |  4 +++
 gas/testsuite/gas/mips/mips1@isa-override-2.s    | 18 -------------
 gas/testsuite/gas/mips/mips2@isa-override-2.d    |  4 +++
 gas/testsuite/gas/mips/mips2@isa-override-2.s    | 18 -------------
 gas/testsuite/gas/mips/mips32@isa-override-2.d   |  4 +++
 gas/testsuite/gas/mips/mips32@isa-override-2.s   | 18 -------------
 gas/testsuite/gas/mips/mips32r2@isa-override-2.d |  4 +++
 gas/testsuite/gas/mips/mips32r2@isa-override-2.s | 18 -------------
 gas/testsuite/gas/mips/mips32r3@isa-override-2.d |  4 +++
 gas/testsuite/gas/mips/mips32r3@isa-override-2.s | 18 -------------
 gas/testsuite/gas/mips/mips32r5@isa-override-2.d |  4 +++
 gas/testsuite/gas/mips/mips32r5@isa-override-2.s | 18 -------------
 gas/testsuite/gas/mips/mips32r6@isa-override-2.d |  4 +++
 gas/testsuite/gas/mips/mips32r6@isa-override-2.s | 18 -------------
 gas/testsuite/gas/mips/octeon3@isa-override-2.d  |  4 +++
 gas/testsuite/gas/mips/octeon3@isa-override-2.s  | 18 -------------
 gas/testsuite/gas/mips/r3000@isa-override-2.d    |  4 +++
 gas/testsuite/gas/mips/r3000@isa-override-2.l    |  4 ---
 gas/testsuite/gas/mips/r3000@isa-override-2.s    | 18 -------------
 gas/testsuite/gas/mips/r3900@isa-override-2.d    |  4 +++
 gas/testsuite/gas/mips/r3900@isa-override-2.s    | 18 -------------
 24 files changed, 78 insertions(+), 185 deletions(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 62d18c3..be2a658 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,38 @@
 2017-05-10  Maciej W. Rozycki  <macro@imgtec.com>
 
+	* testsuite/gas/mips/isa-override-2.d: New test.
+	* testsuite/gas/mips/mips1@isa-override-2.d: New test.
+	* testsuite/gas/mips/r3000@isa-override-2.d: New test.
+	* testsuite/gas/mips/r3900@isa-override-2.d: New test.
+	* testsuite/gas/mips/mips2@isa-override-2.d: New test.
+	* testsuite/gas/mips/mips32@isa-override-2.d: New test.
+	* testsuite/gas/mips/mips32r2@isa-override-2.d: New test.
+	* testsuite/gas/mips/mips32r3@isa-override-2.d: New test.
+	* testsuite/gas/mips/mips32r5@isa-override-2.d: New test.
+	* testsuite/gas/mips/mips32r6@isa-override-2.d: New test.
+	* testsuite/gas/mips/octeon3@isa-override-2.d: New test.
+	* testsuite/gas/mips/r3000@isa-override-2.l: Remove list test.
+	* testsuite/gas/mips/mips1@isa-override-2.s: Remove test source.
+	* testsuite/gas/mips/r3000@isa-override-2.s: Remove test source.
+	* testsuite/gas/mips/r3900@isa-override-2.s: Remove test source.
+	* testsuite/gas/mips/mips2@isa-override-2.s: Remove test source.
+	* testsuite/gas/mips/mips32@isa-override-2.s: Remove test
+	source.
+	* testsuite/gas/mips/mips32r2@isa-override-2.s: Remove test
+	source.
+	* testsuite/gas/mips/mips32r3@isa-override-2.s: Remove test
+	source.
+	* testsuite/gas/mips/mips32r5@isa-override-2.s: Remove test
+	source.
+	* testsuite/gas/mips/mips32r6@isa-override-2.s: Remove test
+	source.
+	* testsuite/gas/mips/octeon3@isa-override-2.s: Remove test
+	source.
+	* gas/testsuite/gas/mips/mips.exp: Fold corresponding list tests
+	into the new tests.
+
+2017-05-10  Maciej W. Rozycki  <macro@imgtec.com>
+
 	* testsuite/gas/mips/mips16e-sub.d: Correct test name.
 	* testsuite/gas/mips/mips16-32@mips16e-sub.d: Likewise.
 	* testsuite/gas/mips/mips16-64@mips16e-sub.d: Likewise.
diff --git a/gas/testsuite/gas/mips/isa-override-2.d b/gas/testsuite/gas/mips/isa-override-2.d
new file mode 100644
index 0000000..8ad46ef
--- /dev/null
+++ b/gas/testsuite/gas/mips/isa-override-2.d
@@ -0,0 +1,4 @@
+#name: MIPS ISA override code generation 2
+#as: -32
+#source: isa-override-2.s
+#error-output: isa-override-2.l
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index b71f600..9574d22 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -1875,7 +1875,7 @@ if { [istarget mips*-*-vxworks*] } {
     run_dump_test "option-pic-relax-5"
 
     run_dump_test_arches "isa-override-1" "" [mips_arch_list_matching mips1]
-    run_list_test_arches "isa-override-2" "-32" [mips_arch_list_matching mips1]
+    run_dump_test_arches "isa-override-2" "" [mips_arch_list_matching mips1]
 
     run_dump_test "debug-label-end-1"
     run_dump_test "debug-label-end-2"
diff --git a/gas/testsuite/gas/mips/mips1@isa-override-2.d b/gas/testsuite/gas/mips/mips1@isa-override-2.d
new file mode 100644
index 0000000..63f6b39
--- /dev/null
+++ b/gas/testsuite/gas/mips/mips1@isa-override-2.d
@@ -0,0 +1,4 @@
+#name: MIPS ISA override code generation 2
+#as: -32
+#source: isa-override-2.s
+#error-output: mips1@isa-override-2.l
diff --git a/gas/testsuite/gas/mips/mips1@isa-override-2.s b/gas/testsuite/gas/mips/mips1@isa-override-2.s
deleted file mode 100644
index 402c118..0000000
--- a/gas/testsuite/gas/mips/mips1@isa-override-2.s
+++ /dev/null
@@ -1,18 +0,0 @@
-	.text
-	.globl	foo
-	.ent	foo
-foo:
-	dli	$2, 0x9000000080000000
-	.set	push
-	.set	mips3
-	dli	$2, 0x9000000080000000
-	.set	mips0
-	dli	$2, 0x9000000080000000
-	.set	mips3
-	.set	pop
-	dli	$2, 0x9000000080000000
-	.end	foo
-
-# Force some (non-delay-slot) zero bytes, to make 'objdump' print ...
-	.align	4, 0
-	.space	16
diff --git a/gas/testsuite/gas/mips/mips2@isa-override-2.d b/gas/testsuite/gas/mips/mips2@isa-override-2.d
new file mode 100644
index 0000000..457ef82
--- /dev/null
+++ b/gas/testsuite/gas/mips/mips2@isa-override-2.d
@@ -0,0 +1,4 @@
+#name: MIPS ISA override code generation 2
+#as: -32
+#source: isa-override-2.s
+#error-output: mips2@isa-override-2.l
diff --git a/gas/testsuite/gas/mips/mips2@isa-override-2.s b/gas/testsuite/gas/mips/mips2@isa-override-2.s
deleted file mode 100644
index 402c118..0000000
--- a/gas/testsuite/gas/mips/mips2@isa-override-2.s
+++ /dev/null
@@ -1,18 +0,0 @@
-	.text
-	.globl	foo
-	.ent	foo
-foo:
-	dli	$2, 0x9000000080000000
-	.set	push
-	.set	mips3
-	dli	$2, 0x9000000080000000
-	.set	mips0
-	dli	$2, 0x9000000080000000
-	.set	mips3
-	.set	pop
-	dli	$2, 0x9000000080000000
-	.end	foo
-
-# Force some (non-delay-slot) zero bytes, to make 'objdump' print ...
-	.align	4, 0
-	.space	16
diff --git a/gas/testsuite/gas/mips/mips32@isa-override-2.d b/gas/testsuite/gas/mips/mips32@isa-override-2.d
new file mode 100644
index 0000000..76b2d46
--- /dev/null
+++ b/gas/testsuite/gas/mips/mips32@isa-override-2.d
@@ -0,0 +1,4 @@
+#name: MIPS ISA override code generation 2
+#as: -32
+#source: isa-override-2.s
+#error-output: mips32@isa-override-2.l
diff --git a/gas/testsuite/gas/mips/mips32@isa-override-2.s b/gas/testsuite/gas/mips/mips32@isa-override-2.s
deleted file mode 100644
index 402c118..0000000
--- a/gas/testsuite/gas/mips/mips32@isa-override-2.s
+++ /dev/null
@@ -1,18 +0,0 @@
-	.text
-	.globl	foo
-	.ent	foo
-foo:
-	dli	$2, 0x9000000080000000
-	.set	push
-	.set	mips3
-	dli	$2, 0x9000000080000000
-	.set	mips0
-	dli	$2, 0x9000000080000000
-	.set	mips3
-	.set	pop
-	dli	$2, 0x9000000080000000
-	.end	foo
-
-# Force some (non-delay-slot) zero bytes, to make 'objdump' print ...
-	.align	4, 0
-	.space	16
diff --git a/gas/testsuite/gas/mips/mips32r2@isa-override-2.d b/gas/testsuite/gas/mips/mips32r2@isa-override-2.d
new file mode 100644
index 0000000..3625719
--- /dev/null
+++ b/gas/testsuite/gas/mips/mips32r2@isa-override-2.d
@@ -0,0 +1,4 @@
+#name: MIPS ISA override code generation 2
+#as: -32
+#source: isa-override-2.s
+#error-output: mips32r2@isa-override-2.l
diff --git a/gas/testsuite/gas/mips/mips32r2@isa-override-2.s b/gas/testsuite/gas/mips/mips32r2@isa-override-2.s
deleted file mode 100644
index 402c118..0000000
--- a/gas/testsuite/gas/mips/mips32r2@isa-override-2.s
+++ /dev/null
@@ -1,18 +0,0 @@
-	.text
-	.globl	foo
-	.ent	foo
-foo:
-	dli	$2, 0x9000000080000000
-	.set	push
-	.set	mips3
-	dli	$2, 0x9000000080000000
-	.set	mips0
-	dli	$2, 0x9000000080000000
-	.set	mips3
-	.set	pop
-	dli	$2, 0x9000000080000000
-	.end	foo
-
-# Force some (non-delay-slot) zero bytes, to make 'objdump' print ...
-	.align	4, 0
-	.space	16
diff --git a/gas/testsuite/gas/mips/mips32r3@isa-override-2.d b/gas/testsuite/gas/mips/mips32r3@isa-override-2.d
new file mode 100644
index 0000000..fe6298e
--- /dev/null
+++ b/gas/testsuite/gas/mips/mips32r3@isa-override-2.d
@@ -0,0 +1,4 @@
+#name: MIPS ISA override code generation 2
+#as: -32
+#source: isa-override-2.s
+#error-output: mips32r3@isa-override-2.l
diff --git a/gas/testsuite/gas/mips/mips32r3@isa-override-2.s b/gas/testsuite/gas/mips/mips32r3@isa-override-2.s
deleted file mode 100644
index 402c118..0000000
--- a/gas/testsuite/gas/mips/mips32r3@isa-override-2.s
+++ /dev/null
@@ -1,18 +0,0 @@
-	.text
-	.globl	foo
-	.ent	foo
-foo:
-	dli	$2, 0x9000000080000000
-	.set	push
-	.set	mips3
-	dli	$2, 0x9000000080000000
-	.set	mips0
-	dli	$2, 0x9000000080000000
-	.set	mips3
-	.set	pop
-	dli	$2, 0x9000000080000000
-	.end	foo
-
-# Force some (non-delay-slot) zero bytes, to make 'objdump' print ...
-	.align	4, 0
-	.space	16
diff --git a/gas/testsuite/gas/mips/mips32r5@isa-override-2.d b/gas/testsuite/gas/mips/mips32r5@isa-override-2.d
new file mode 100644
index 0000000..f9f7d14
--- /dev/null
+++ b/gas/testsuite/gas/mips/mips32r5@isa-override-2.d
@@ -0,0 +1,4 @@
+#name: MIPS ISA override code generation 2
+#as: -32
+#source: isa-override-2.s
+#error-output: mips32r5@isa-override-2.l
diff --git a/gas/testsuite/gas/mips/mips32r5@isa-override-2.s b/gas/testsuite/gas/mips/mips32r5@isa-override-2.s
deleted file mode 100644
index 402c118..0000000
--- a/gas/testsuite/gas/mips/mips32r5@isa-override-2.s
+++ /dev/null
@@ -1,18 +0,0 @@
-	.text
-	.globl	foo
-	.ent	foo
-foo:
-	dli	$2, 0x9000000080000000
-	.set	push
-	.set	mips3
-	dli	$2, 0x9000000080000000
-	.set	mips0
-	dli	$2, 0x9000000080000000
-	.set	mips3
-	.set	pop
-	dli	$2, 0x9000000080000000
-	.end	foo
-
-# Force some (non-delay-slot) zero bytes, to make 'objdump' print ...
-	.align	4, 0
-	.space	16
diff --git a/gas/testsuite/gas/mips/mips32r6@isa-override-2.d b/gas/testsuite/gas/mips/mips32r6@isa-override-2.d
new file mode 100644
index 0000000..c80e6cb
--- /dev/null
+++ b/gas/testsuite/gas/mips/mips32r6@isa-override-2.d
@@ -0,0 +1,4 @@
+#name: MIPS ISA override code generation 2
+#as: -32
+#source: isa-override-2.s
+#error-output: mips32r6@isa-override-2.l
diff --git a/gas/testsuite/gas/mips/mips32r6@isa-override-2.s b/gas/testsuite/gas/mips/mips32r6@isa-override-2.s
deleted file mode 100644
index 402c118..0000000
--- a/gas/testsuite/gas/mips/mips32r6@isa-override-2.s
+++ /dev/null
@@ -1,18 +0,0 @@
-	.text
-	.globl	foo
-	.ent	foo
-foo:
-	dli	$2, 0x9000000080000000
-	.set	push
-	.set	mips3
-	dli	$2, 0x9000000080000000
-	.set	mips0
-	dli	$2, 0x9000000080000000
-	.set	mips3
-	.set	pop
-	dli	$2, 0x9000000080000000
-	.end	foo
-
-# Force some (non-delay-slot) zero bytes, to make 'objdump' print ...
-	.align	4, 0
-	.space	16
diff --git a/gas/testsuite/gas/mips/octeon3@isa-override-2.d b/gas/testsuite/gas/mips/octeon3@isa-override-2.d
new file mode 100644
index 0000000..bb4e0a9
--- /dev/null
+++ b/gas/testsuite/gas/mips/octeon3@isa-override-2.d
@@ -0,0 +1,4 @@
+#name: MIPS ISA override code generation 2
+#as: -32
+#source: isa-override-2.s
+#error-output: octeon3@isa-override-2.l
diff --git a/gas/testsuite/gas/mips/octeon3@isa-override-2.s b/gas/testsuite/gas/mips/octeon3@isa-override-2.s
deleted file mode 100644
index 402c118..0000000
--- a/gas/testsuite/gas/mips/octeon3@isa-override-2.s
+++ /dev/null
@@ -1,18 +0,0 @@
-	.text
-	.globl	foo
-	.ent	foo
-foo:
-	dli	$2, 0x9000000080000000
-	.set	push
-	.set	mips3
-	dli	$2, 0x9000000080000000
-	.set	mips0
-	dli	$2, 0x9000000080000000
-	.set	mips3
-	.set	pop
-	dli	$2, 0x9000000080000000
-	.end	foo
-
-# Force some (non-delay-slot) zero bytes, to make 'objdump' print ...
-	.align	4, 0
-	.space	16
diff --git a/gas/testsuite/gas/mips/r3000@isa-override-2.d b/gas/testsuite/gas/mips/r3000@isa-override-2.d
new file mode 100644
index 0000000..63f6b39
--- /dev/null
+++ b/gas/testsuite/gas/mips/r3000@isa-override-2.d
@@ -0,0 +1,4 @@
+#name: MIPS ISA override code generation 2
+#as: -32
+#source: isa-override-2.s
+#error-output: mips1@isa-override-2.l
diff --git a/gas/testsuite/gas/mips/r3000@isa-override-2.l b/gas/testsuite/gas/mips/r3000@isa-override-2.l
deleted file mode 100644
index 2ec6684..0000000
--- a/gas/testsuite/gas/mips/r3000@isa-override-2.l
+++ /dev/null
@@ -1,4 +0,0 @@
-.*: Assembler messages:
-.*:5: Error: opcode not supported on this processor: mips1 \(mips1\) `dli \$2,0x9000000080000000'
-.*:10: Error: opcode not supported on this processor: mips1 \(mips1\) `dli \$2,0x9000000080000000'
-.*:13: Error: opcode not supported on this processor: mips1 \(mips1\) `dli \$2,0x9000000080000000'
diff --git a/gas/testsuite/gas/mips/r3000@isa-override-2.s b/gas/testsuite/gas/mips/r3000@isa-override-2.s
deleted file mode 100644
index 402c118..0000000
--- a/gas/testsuite/gas/mips/r3000@isa-override-2.s
+++ /dev/null
@@ -1,18 +0,0 @@
-	.text
-	.globl	foo
-	.ent	foo
-foo:
-	dli	$2, 0x9000000080000000
-	.set	push
-	.set	mips3
-	dli	$2, 0x9000000080000000
-	.set	mips0
-	dli	$2, 0x9000000080000000
-	.set	mips3
-	.set	pop
-	dli	$2, 0x9000000080000000
-	.end	foo
-
-# Force some (non-delay-slot) zero bytes, to make 'objdump' print ...
-	.align	4, 0
-	.space	16
diff --git a/gas/testsuite/gas/mips/r3900@isa-override-2.d b/gas/testsuite/gas/mips/r3900@isa-override-2.d
new file mode 100644
index 0000000..2ee8b7d
--- /dev/null
+++ b/gas/testsuite/gas/mips/r3900@isa-override-2.d
@@ -0,0 +1,4 @@
+#name: MIPS ISA override code generation 2
+#as: -32
+#source: isa-override-2.s
+#error-output: r3900@isa-override-2.l
diff --git a/gas/testsuite/gas/mips/r3900@isa-override-2.s b/gas/testsuite/gas/mips/r3900@isa-override-2.s
deleted file mode 100644
index 402c118..0000000
--- a/gas/testsuite/gas/mips/r3900@isa-override-2.s
+++ /dev/null
@@ -1,18 +0,0 @@
-	.text
-	.globl	foo
-	.ent	foo
-foo:
-	dli	$2, 0x9000000080000000
-	.set	push
-	.set	mips3
-	dli	$2, 0x9000000080000000
-	.set	mips0
-	dli	$2, 0x9000000080000000
-	.set	mips3
-	.set	pop
-	dli	$2, 0x9000000080000000
-	.end	foo
-
-# Force some (non-delay-slot) zero bytes, to make 'objdump' print ...
-	.align	4, 0
-	.space	16
Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]