* 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 09d1c165ad0cadd4c07f4937b855f1c032eba297..046e10620d61b06d8f0b2531178a3e6935004e96 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+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

diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index f14c6ffea4448bee18b1cf2a0cdd3886576641fb..842cfbf2e2a8ac876a4769620725b7e5fb5d78da 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])}}