Testsuite: Raise --rlimit-cpu, update stap_run_batch()

Need to increase --rlimit-cpu, since especially certain buildok
tests seem to reach the old value easily. It turns out that not
only "32-bit arm machines are quite slow", so not distinguishing
the machine type any more and just raising the treshold:

The goal is to raise the limit for low cost. Note that the
"-E 'probe timer.s(900) ...'' limit affects the generated source
that some testcases rely on verbatimely. So setting --rlimit-cpu
just slightly under 15 mins should improve test results without
need to modify those testcases source.

The stap_run_batch() update is needed to deal properly with RPM
packaged testcases, which have slightly modified source code
compared to their git versions due to commit d2995e6f. This update
is an addition to commit 6b131ba7 making it work with RPM packaged
testcases too.

diff --git a/testsuite/lib/systemtap.exp b/testsuite/lib/systemtap.exp
index 032d35e127e859701eeb14c772062384f991191f..bae53a37382122569a67c6af4963657de2ec6b82 100644 (file)
--- a/testsuite/lib/systemtap.exp
+++ b/testsuite/lib/systemtap.exp
@@ -227,14 +227,9 @@ proc setup_systemtap_environment {} {
 
     # All hail the prophet lockdep
     set chan [open $env(SYSTEMTAP_DIR)/rc w]
-    # 32-bit arm machines are quite slow. Let them run for longer than
-    # bigger machines, otherwise systemtap.syscall/syscall.exp (among
-    # other tests) will fail.
-    if {[string match arm* $::tcl_platform(machine)]} {
-       puts $chan "--rlimit-cpu=600"
-    } else {
-       puts $chan "--rlimit-cpu=300"
-    }
+    # Set the --rlimit-cpu just slightly under the 15 minutes, so that following
+    # two independent timeout mechanisms do not coincide.
+    puts $chan "--rlimit-cpu=850"
     puts $chan "-E 'probe timer.s(900){error(\"probe timeout after 15 minutes\")}'"
     close $chan
 
@@ -603,9 +598,9 @@ proc stap_run_batch {filename args} {
         verbose -log "spawn2 $filename $args"
         # Make sure we don't accidentially add an extra empty argument.
         if {$args == ""} {
-            spawn $filename
+            eval spawn $filename
         } else {
-            spawn $filename $args
+            eval spawn $filename $args
         }
     }