sim: cris: replace @srcdir@ test extension with $srcdir/$subdir

The common framework supports $srcdir & $subdir replacements already,
so replace the custom @srcdir@ logic with those.  Since the replace
happens in slurp_options that cris already uses, we don't have any
logic to port over there.  We have to duplicate that into the cris
slurp_rv helper though.

diff --git a/sim/testsuite/cris/c/c.exp b/sim/testsuite/cris/c/c.exp
index 8f39b097a0a928eb42e434eecdc379bd62e12ef1..e5b48661b63b0d9d9a878f77e86c94557b56e564 100644 (file)
--- a/sim/testsuite/cris/c/c.exp
+++ b/sim/testsuite/cris/c/c.exp
@@ -124,8 +124,6 @@ foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.c]] {
        # Replace specific substitutions:
        # @exedir@ is where the test-program is located.
        regsub -all "@exedir@" $opt_val "[pwd]" opt_val
-       # @srcdir@ is where the source of the test-program is located.
-       regsub -all "@srcdir@" $opt_val "$srcdir/$subdir" opt_val
 
        # Multiple of these options concatenate, they don't override.
        if { $opt_name == "output" || $opt_name == "progoptions" } {

diff --git a/sim/testsuite/cris/c/openpf2.c b/sim/testsuite/cris/c/openpf2.c
index 50337b110d4cf786b88d18bfc8abb761a1304bd8..49f09b641ae478e262f13d4c202fc6387d45a12f 100644 (file)
--- a/sim/testsuite/cris/c/openpf2.c
+++ b/sim/testsuite/cris/c/openpf2.c
@@ -1,5 +1,5 @@
 /* Check that the simulator has chdir:ed to the --sysroot argument
-#sim: --sysroot=@srcdir@
+#sim: --sysroot=$srcdir/$subdir
    (or that  --sysroot is applied to relative file paths).  */
 
 #include <stdio.h>

diff --git a/sim/testsuite/cris/hw/rv-n-cris/host1.ms b/sim/testsuite/cris/hw/rv-n-cris/host1.ms
index c41f51f1809b318b4566190855bedfd30b65edb6..78253942a0f2f257f382eb9a6179569f208e9532 100644 (file)
--- a/sim/testsuite/cris/hw/rv-n-cris/host1.ms
+++ b/sim/testsuite/cris/hw/rv-n-cris/host1.ms
@@ -3,6 +3,6 @@
 
 # Check that we trivially resolve a hostname.
 
-#r @,@srcdir@/trivial4.r
+#r @,$srcdir/$subdir/trivial4.r
 
  .include "trivial4.ms"

diff --git a/sim/testsuite/cris/hw/rv-n-cris/rvc.exp b/sim/testsuite/cris/hw/rv-n-cris/rvc.exp
index 4e302d2238fb25fee0dd4388c7d5693989431f26..3d8b5c3813def82024f31b2c1aa875b00f9ebfe6 100644 (file)
--- a/sim/testsuite/cris/hw/rv-n-cris/rvc.exp
+++ b/sim/testsuite/cris/hw/rv-n-cris/rvc.exp
@@ -80,6 +80,7 @@ proc sim_has_rv_and_cris {} {
 # including parameters may not contain ":".
 
 proc slurp_rv { file } {
+    global subdir srcdir
     if [catch { set f [open $file r] } x] {
        #perror "couldn't open `$file': $x"
        perror "$x"
@@ -97,6 +98,10 @@ proc slurp_rv { file } {
        # Whitespace here is space-tab.
        if [regexp $pat $line xxx cmd] {
            # match!
+           set cmd [string map [list \
+               {$srcdir} "$srcdir" \
+               {$subdir} "$subdir" \
+           ] "$cmd"]
            lappend rv_array $cmd
            set seen_opt 1
        } else {
@@ -204,11 +209,6 @@ if [istarget cris*-*-*] {
                    error "$x"
                } {
                    set contents [join $hostcmds "\n"]
-
-                   # Make it possible to use files from the test
-                   # source directory; expected with the @-command.
-                   regsub -all "@srcdir@" $contents "$srcdir/$subdir" contents
-
                    verbose "rv: $contents" 2
                    puts $f $contents
                    close $f

diff --git a/sim/testsuite/cris/hw/rv-n-cris/trivial4.ms b/sim/testsuite/cris/hw/rv-n-cris/trivial4.ms
index 6108160f962cffae2525288d5bbf744c2ef65772..3259f3ee52e6c42e4c79182ffcceb6e4c99adaa1 100644 (file)
--- a/sim/testsuite/cris/hw/rv-n-cris/trivial4.ms
+++ b/sim/testsuite/cris/hw/rv-n-cris/trivial4.ms
@@ -1,5 +1,5 @@
 #mach: crisv32
-#r @,@srcdir@/trivial4.r
+#r @,$srcdir/$subdir/trivial4.r
 
 # Test read and writes.
 

diff --git a/sim/testsuite/cris/hw/rv-n-cris/trivial5.ms b/sim/testsuite/cris/hw/rv-n-cris/trivial5.ms
index 849f17ebb4507f03ee317074d0b888a39e998ca6..c75e09fc6da03f029db8bb56a78b80e664f35ff3 100644 (file)
--- a/sim/testsuite/cris/hw/rv-n-cris/trivial5.ms
+++ b/sim/testsuite/cris/hw/rv-n-cris/trivial5.ms
@@ -11,6 +11,6 @@
 
 # Test trace output for read and write.
 
-#r @,@srcdir@/trivial4.r
+#r @,$srcdir/$subdir/trivial4.r
 
  .include "trivial4.ms"