From: Maciej W. Rozycki <macro@linux-mips.org>
Date: Mon, 5 Jul 2010 23:57:27 +0000 (+0000)
Subject: 	* gas/mips/mips.exp (run_dump_test_arch): Check for the presence
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=193fa6328710bfb9d275c0e18f1f2a4e90921338;p=binutils-gdb.git

	* 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 09d1c165ad0..046e10620d6 100644
--- 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 f14c6ffea44..842cfbf2e2a 100644
--- 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])}}