aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/lib/scanasm.exp2
2 files changed, 5 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 67fa553..0360b7c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,9 @@
2012-12-15 Eric Botcazou <ebotcazou@adacore.com>
+ * lib/scanasm.exp (get_ada_spec_filename): Use procedural form.
+
+2012-12-15 Eric Botcazou <ebotcazou@adacore.com>
+
PR ada/52735
* gnat.dg/nested_generic1.adb: New test.
* gnat.dg/nested_generic1_pkg.ad[sb]: New helper.
diff --git a/gcc/testsuite/lib/scanasm.exp b/gcc/testsuite/lib/scanasm.exp
index 598948e..a7d4f43 100644
--- a/gcc/testsuite/lib/scanasm.exp
+++ b/gcc/testsuite/lib/scanasm.exp
@@ -191,7 +191,7 @@ proc get_ada_spec_filename { testcase } {
set filename [lindex $testcase 0]
set tailname [file tail $filename]
set extension [string trimleft [file extension $tailname] {.}]
- set rootname [regsub -all {\-} [file rootname $tailname] {_}]
+ regsub -all {\-} [file rootname $tailname] {_} rootname
return [string tolower "${rootname}_${extension}.ads"]
}