aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Botcazou <ebotcazou@adacore.com>2012-12-15 19:16:24 +0000
committerEric Botcazou <ebotcazou@gcc.gnu.org>2012-12-15 19:16:24 +0000
commit25293279b2461d483999e3ffd9b1a1401d5dc64d (patch)
tree60c6ab2956aa4b2bf9c80b97c9e61243d16b01ec
parent8ffcc234e8bf004568745aa52391c1434c2ad3df (diff)
downloadgcc-25293279b2461d483999e3ffd9b1a1401d5dc64d.zip
gcc-25293279b2461d483999e3ffd9b1a1401d5dc64d.tar.gz
gcc-25293279b2461d483999e3ffd9b1a1401d5dc64d.tar.bz2
* lib/scanasm.exp (get_ada_spec_filename): Use procedural form.
From-SVN: r194524
-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"]
}