PR12136: Tweak the cast-scope testcase

- Use unnamed process.* to allow -c to guarantee the right path
- Specify the function probe's file, so we don't accidentally pick up
  any other length(), like string::length().

diff --git a/testsuite/systemtap.base/cast-scope.exp b/testsuite/systemtap.base/cast-scope.exp
index c329f0a5b816d26b6cfd3528c511ad1c55366636..bc68c2b8cbbb94c44832f11d5c1b1147461fcc8d 100644 (file)
--- a/testsuite/systemtap.base/cast-scope.exp
+++ b/testsuite/systemtap.base/cast-scope.exp
@@ -20,7 +20,7 @@ if { $res != "" } {
 
 set stpfile "$srcdir/$subdir/$test.stp"
 if {[installtest_p] && [uprobes_p]} {
-  stap_run3 "$test" "$stpfile" $test.exe -c ./$test.exe
+  stap_run3 "$test" "$stpfile" -c ./$test.exe
 } else {
   untested "$test"
 }

diff --git a/testsuite/systemtap.base/cast-scope.stp b/testsuite/systemtap.base/cast-scope.stp
index acbc4ecf5a679fe8582cdca9bf9cbc5d2dbd7bd3..2b55d939b60c8d968ae929bacfe06a96ba75aa12 100644 (file)
--- a/testsuite/systemtap.base/cast-scope.stp
+++ b/testsuite/systemtap.base/cast-scope.stp
@@ -1,16 +1,16 @@
-probe process("cast-scope.exe").function("length")
+probe process.function("length@cast-scope.cxx")
 {
   println("function direct: ", $str$$)
   println("function cast: ", @cast($str, "std::string")$$)
 }
 
-probe process("cast-scope.exe").statement("length@cast-scope.cxx+1")
+probe process.statement("length@cast-scope.cxx+1")
 {
   println("statement direct: ", $str$$)
   println("statement cast: ", @cast($str, "std::string")$$)
 }
 
-probe process("cast-scope.exe").mark("length")
+probe process.mark("length")
 {
   println("mark cast: ", @cast($arg1, "std::string")$$)
 }