testsuite callee.exp: Hunt for the last FAIL:

The hunt is not successful (1 FAIL:), but the tcl code is being
gradually simplified and more diagnostics emitted to help find the
culprit.

diff --git a/testsuite/systemtap.base/callee.exp b/testsuite/systemtap.base/callee.exp
index 73464fba2d3729554d45d2ac7d666d06166d57e2..431223a92b4c51b1b2125624d0ed67e0110aa3c3 100644 (file)
--- a/testsuite/systemtap.base/callee.exp
+++ b/testsuite/systemtap.base/callee.exp
@@ -157,8 +157,7 @@ proc expect_probe { func callee expout {inlined 0} {return_p 0} {call_p 0} } {
    set script " \
       probe [build_probe $func $callee $return_p $call_p] { \
          printf(\"caller %s callee %s\\n\", $caller, ppfunc()) \
-      } \
-   "
+      }"
 
    # Build the expect regex: callee1caller1|callee2caller2|...
    set n 0
@@ -173,7 +172,7 @@ proc expect_probe { func callee expout {inlined 0} {return_p 0} {call_p 0} } {
    }
 
    # Spawn stap
-   eval spawn stap -we {$script} -c "./$test"
+   spawn stap -e "$script" -c "./$test ; true"
    expect {
       -timeout 30
       -re "$regexp" {
@@ -554,7 +553,7 @@ if {![installtest_p]} {
    "
 
    # Spawn stap
-   eval spawn stap -we {$script} -c "./$subtest"
+   spawn stap -e "$script" -c "./$subtest ; true"
    set failed 1
    expect {
       -timeout 30