4 files changed, 90 insertions, 5 deletions
diff --git a/testsuite/systemtap.base/alternatives.exp b/testsuite/systemtap.base/alternatives.exp
index 6cbc1e10..f5dc4513 100644
--- a/testsuite/systemtap.base/alternatives.exp
+++ b/testsuite/systemtap.base/alternatives.exp
@@ -26,10 +26,11 @@ proc stap_run_alternatives {args} {
     verbose -log "starting $args"
     eval spawn $args
     expect { 
+	-timeout 60
 	-re {semantic error: .+ \(alternatives: [a-zA-Z_]} {incr alternatives_found; exp_continue}
         -re {[^\r]*\r} { verbose -log $expect_out(0,string); exp_continue } 
-        eof { }
-        timeout { } 
+        eof { verbose -log "EOF" }
+        timeout { verbose -log "TIMEOUT" }
     }
     set results [wait]
     verbose -log "wait results: $results"
diff --git a/testsuite/systemtap.base/flightrec3.exp b/testsuite/systemtap.base/flightrec3.exp
new file mode 100644
index 00000000..5b9d8253
--- /dev/null
+++ b/testsuite/systemtap.base/flightrec3.exp
@@ -0,0 +1,79 @@
+set test "flightrec3"
+if {![installtest_p]} { untested $test; return }
+
+# cleanup
+system "rm -f flightlog.out*"
+
+set pid 0
+# check -S option with bulk(percpu file) mode
+spawn stap -F -o flightlog.out -S 1,3 -b $srcdir/$subdir/$test.stp
+expect {
+  -timeout 240
+  -re {([0-9]+)\r\n} {
+      pass "$test (-S option with bulk mode)"
+      set pid $expect_out(1,string)
+      exp_continue}
+  timeout { fail "$test (timeout)"}
+  eof { }
+}
+wait
+if {$pid == 0} {
+  fail "$test (no pid)"
+  return -1
+}
+
+exec sleep 4
+array set cpus {}
+set scnt 0
+# wait for log files
+exec kill -STOP $pid
+exec sleep 1
+eval spawn stat -c \"%n %s\" [glob flightlog.out_cpu*]
+expect {
+  -timeout 100
+  -re {flightlog.out_cpu([0-9]+).[0-9]+ ([0-9]+)\r\n} {
+      set cpuid $expect_out(1,string)
+      set size $expect_out(2,string)
+      if {[array get cpus $cpuid] == ""} {set cpus($cpuid) 0}
+      incr cpus($cpuid);
+      if {$size <= 1048576 } {incr scnt}
+      exp_continue}
+  timeout { fail "$test (logfile timeout)"}
+}
+wait
+exec kill -CONT $pid
+exec sleep 3
+exec kill -STOP $pid
+eval spawn stat -c \"%n %s\" [glob flightlog.out_cpu*]
+expect {
+  -timeout 100
+  -re {flightlog.out_cpu([0-9]+).[0-9]+ ([0-9]+)\r\n} {
+      set cpuid $expect_out(1,string)
+      set size $expect_out(2,string)
+      if {[array get cpus $cpuid] == ""} {set cpus($cpuid) 0}
+      incr cpus($cpuid);
+      if {$size <= 1048576 } {incr scnt}
+      exp_continue}
+  timeout { fail "$test (logfile timeout)"}
+}
+wait
+exec kill -CONT $pid
+# check logfile number
+set cnt 0
+foreach e [array names cpus] {
+    if {$cpus($e) != 6} {
+        fail "$test (log file numbers cpu:$e, cnt:$cpus($e)))"
+    }
+    set cnt [expr $cnt + $cpus($e)]
+}
+# check logfile size
+if {$scnt == $cnt} {
+    pass "$test (log file size limitation with bulk mode)"
+} else {
+    fail "$test (log file size ($scnt != $cnt))"
+}
+exec kill -TERM $pid
+# wait for exiting...
+exec sleep 1
+system "rm -f flightlog.out*"
+
diff --git a/testsuite/systemtap.base/flightrec3.stp b/testsuite/systemtap.base/flightrec3.stp
new file mode 100644
index 00000000..d660793f
--- /dev/null
+++ b/testsuite/systemtap.base/flightrec3.stp
@@ -0,0 +1,5 @@
+probe kernel.function("update_process_times")
+{
+  for (j = 0; j < 100; j++)
+    printf("1234567890\n")
+}
diff --git a/testsuite/systemtap.base/skipped.exp b/testsuite/systemtap.base/skipped.exp
index 8c491037..f3048c8a 100644
--- a/testsuite/systemtap.base/skipped.exp
+++ b/testsuite/systemtap.base/skipped.exp
@@ -2,8 +2,8 @@ set test "skip tracking"
 
 if {! [installtest_p]} { untested $test; return }
 
-set cpus [exec sh -c "grep ^processor /proc/cpuinfo | wc -l"]
-if {$cpus < 2} { unsupported $test; return }
+set nr_cpus [exec sh -c "grep ^processor /proc/cpuinfo | wc -l"]
+if {$nr_cpus < 2} { unsupported $test; return }
 
 set ok 0
 spawn stap -e "probe timer.s(5) {exit()} probe timer.profile,syscall.* {f++} global f" -DMAXTRYLOCK=0 -tu
@@ -18,4 +18,4 @@ expect {
 catch {close}
 catch {wait}
 
-if {$ok >= 3} { pass "$test ($cpus $ok)" } else { fail "$test ($cpus $ok)" }
+if {$ok >= 3} { pass "$test ($nr_cpus $ok)" } else { fail "$test ($nr_cpus $ok)" }