* gas/mips/mips.exp (run_dump_test_arch): Check for the presence

	of an architecture-specific test first and use it if found,
	before falling back to the generic one.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 09d1c16..046e106 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,5 +1,11 @@
 2010-07-05  Maciej W. Rozycki  <macro@codesourcery.com>
 
+       * gas/mips/mips.exp (run_dump_test_arch): Check for the presence
+       of an architecture-specific test first and use it if found,
+       before falling back to the generic one.
+
+2010-07-05  Maciej W. Rozycki  <macro@codesourcery.com>
+
        * gas/mips/mips4-fp.d, gas/mips/mips4-fp.s: Remove checks for
        branch-likely instructions and place them...
        * gas/mips/mips4-branch-likely.d, gas/mips/mips4-branch-likely.s:

diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index f14c6ff..842cfbf 100644 (file)
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -271,7 +271,12 @@ proc mips_arch_list_matching {args} {
 # Invoke "run_dump_test" for test NAME, with extra assembler and
 # disassembler flags to test architecture ARCH.
 proc run_dump_test_arch { name arch } {
-    global subdir
+    global subdir srcdir
+
+    set archname "${arch}@${name}"
+    if { [file exists "$srcdir/$subdir/${archname}.d"] } {
+       set name $archname
+    }
 
     if [catch {run_dump_test $name \
                             "{name    {([mips_arch_displayname $arch])}}