diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/testsuite/lib/libjava.exp | 2 | ||||
| -rw-r--r-- | libjava/testsuite/libjava.mauve/mauve.exp | 6 |
3 files changed, 11 insertions, 3 deletions
diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog index 9a2e9b3..1fc2cff 100644 --- a/libjava/testsuite/ChangeLog +++ b/libjava/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2003-02-15 Mark Wielaard <mark@klomp.org> + + * lib/libjava.exp (test_libjava_from_javac): Use regsub not string map. + * libjava.mauve/mauve.exp (mauve_compute_uses): Likewise. + (test_mauve): Likewise. + 2003-02-14 Mark Wielaard <mark@klomp.org> * lib/libjava.exp (test_libjava_from_javac): Don't create .o files diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp index d9aa178..6be5ec6 100644 --- a/libjava/testsuite/lib/libjava.exp +++ b/libjava/testsuite/lib/libjava.exp @@ -788,7 +788,7 @@ proc test_libjava_from_javac { options srcfile compile_args inpfile resultfile e foreach c_file $class_files { set executable [file rootname [file tail $c_file]].o # Don't write files which contain $ chars. - set executable [string map {$ ^} $executable] + regsub -all "\\$" $executable "\^" executable set x [libjava_prune_warnings \ [libjava_tcompile '$c_file' "$executable" $type $args]] lappend removeList $executable diff --git a/libjava/testsuite/libjava.mauve/mauve.exp b/libjava/testsuite/libjava.mauve/mauve.exp index 5eefd5d..cdc7e21 100644 --- a/libjava/testsuite/libjava.mauve/mauve.exp +++ b/libjava/testsuite/libjava.mauve/mauve.exp @@ -49,7 +49,8 @@ proc mauve_compute_uses {aName} { # Now add all inner classes foreach inner [glob -nocomplain [file rootname $file]$*.class] { # Prevent excessive escaping by replacing $ with a ^ in the .o name - set inner [string map {$ ^} [file rootname $inner]].o + set inner [file rootname $inner].o + regsub -all "\\$" $inner "\^" inner lappend uses($item) $inner } } @@ -186,7 +187,8 @@ proc test_mauve {} { if {! [file exists $obj]} then { verbose "compiling $obj for test of $class" # The .class file does contain a $, but we can quote it between "'"s. - set srcfile [string map {^ $} [file rootname $obj]].class + set srcfile [file rootname $obj].class + regsub -all "\\^" $srcfile "\$" srcfile set x [libjava_prune_warnings \ [libjava_tcompile '[pwd]/$srcfile' $obj object $compile_args]] if {$x != ""} then { |