This is the mail archive of the systemtap@sourceware.org mailing list for the systemtap project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

ARM port of testsuite and general testsuite fixes


The ARM version of the test suite of 20070602 just completed.  I'll
post the specifics later.  With the earlier patches plus the patch
below, here's the summary using a 2.6.21.1 kernel in case anyone's
curious:

=======
               === systemtap Summary ===

# of expected passes            277
# of unexpected failures        37
# of unexpected successes       1
# of expected failures          129
# of known failures             7
# of untested testcases         30
# of unsupported tests          3
=======

Below is the patch necessary to fix all timeout problems when running
on an ARM processor and other porting issues related to ARM.

I didn't go with a strategy that makes the hardcoded timeout values
variable.  Once I fixed various testsuite bugs, the timeout values
didn't increase all that much after all.  I felt the difference
wasn't enough warrant switching to a new scheme for.  If people feel
otherwise, we should discuss it further.

There are various bug fixes scattered throughout the patch.  Please
review them carefully, but most should be self-explanatory.  One
to note that isn't a bug fix but just a more robust style is in
syscall.exp where I changed it from using an if-statement to a
switch statement when adding the case for ARM.

If any of these changes are not acceptable, please let me know.

Quentin





Index: systemtap-20070602/testsuite/systemtap.maps/absentstats.exp
===================================================================
--- systemtap-20070602/testsuite/systemtap.maps/absentstats.exp (.../vendor/usr/src) (revision 214)
+++ systemtap-20070602/testsuite/systemtap.maps/absentstats.exp (.../branches/kprobes/usr/src) (revision 214)
@@ -10,7 +10,7 @@ set ko 0
spawn stap -DMAXERRORS=20 $srcdir/$subdir/$test.stp
# spawn echo hello children 0
expect {
- -timeout 60
+ -timeout 150
-re {^ERROR: empty aggregate[^\r]*\r} { incr ko ; exp_continue }
-re {^WARNING: Number of errors} { incr ko ; exp_continue }
-re {^0\r} { incr ok ; exp_continue }
Index: systemtap-20070602/testsuite/systemtap.maps/pmap_agg_overflow.exp
===================================================================
--- systemtap-20070602/testsuite/systemtap.maps/pmap_agg_overflow.exp (.../vendor/usr/src) (revision 214)
+++ systemtap-20070602/testsuite/systemtap.maps/pmap_agg_overflow.exp (.../branches/kprobes/usr/src) (revision 214)
@@ -9,13 +9,14 @@ set skip_result "^WARNING: This test onl
# spawn test
spawn stap -DMAXERRORS=1 -g $srcdir/$subdir/$test.stp
expect {
+ -timeout 240
-re $pass_result {
pass "$test passed"
}
-re $skip_result {
unsupported "$test requires smp"
}
- -timeout 30 { + timeout {
send "\003"
fail "$test timed out"
}
Index: systemtap-20070602/testsuite/systemtap.maps/foreach_fail.exp
===================================================================
--- systemtap-20070602/testsuite/systemtap.maps/foreach_fail.exp (.../vendor/usr/src) (revision 214)
+++ systemtap-20070602/testsuite/systemtap.maps/foreach_fail.exp (.../branches/kprobes/usr/src) (revision 214)
@@ -7,6 +7,7 @@ if {![installtest_p]} { untested $test;


spawn stap $srcdir/$subdir/$test.stp
expect {
+ -timeout 60
timeout { fail "$test timed out" }
eof { Index: systemtap-20070602/testsuite/systemtap.maps/ix_clear.exp
===================================================================
--- systemtap-20070602/testsuite/systemtap.maps/ix_clear.exp (.../vendor/usr/src) (revision 214)
+++ systemtap-20070602/testsuite/systemtap.maps/ix_clear.exp (.../branches/kprobes/usr/src) (revision 214)
@@ -9,10 +9,11 @@ set pass_result {foo\[1\] = 1 1*ERROR: e
# spawn test
spawn stap $srcdir/$subdir/$test.stp
expect {
+ -timeout 150
$pass_result {
pass "$test passed"
}
- -timeout 30 { + timeout { send "\003"
fail "$test timed out"
}
Index: systemtap-20070602/testsuite/systemtap.maps/ix_clear2.exp
===================================================================
--- systemtap-20070602/testsuite/systemtap.maps/ix_clear2.exp (.../vendor/usr/src) (revision 214)
+++ systemtap-20070602/testsuite/systemtap.maps/ix_clear2.exp (.../branches/kprobes/usr/src) (revision 214)
@@ -10,10 +10,11 @@ set pass_result {foo\[1\] = 1 1*ERROR: e
# spawn test
spawn stap $srcdir/$subdir/$test.stp
expect {
+ -timeout 150
$pass_result {
pass "$test passed"
}
- -timeout 30 { + timeout {
send "\003"
fail "$test timed out"
}
Index: systemtap-20070602/testsuite/systemtap.maps/ix_clear3.exp
===================================================================
--- systemtap-20070602/testsuite/systemtap.maps/ix_clear3.exp (.../vendor/usr/src) (revision 214)
+++ systemtap-20070602/testsuite/systemtap.maps/ix_clear3.exp (.../branches/kprobes/usr/src) (revision 214)
@@ -8,10 +8,11 @@ set pass_result {*ERROR: empty aggregate
# spawn test
spawn stap $srcdir/$subdir/$test.stp
expect {
+ -timeout 150
$pass_result {
pass "$test passed"
}
- -timeout 30 { + timeout {
send "\003"
fail "$test timed out"
}
Index: systemtap-20070602/testsuite/systemtap.samples/primes.exp
===================================================================
--- systemtap-20070602/testsuite/systemtap.samples/primes.exp (.../vendor/usr/src) (revision 214)
+++ systemtap-20070602/testsuite/systemtap.samples/primes.exp (.../branches/kprobes/usr/src) (revision 214)
@@ -4,7 +4,7 @@ if {![installtest_p]} { untested $test; spawn stap $srcdir/$subdir/primes.stp
set ok 0
expect {
- -timeout 30
+ -timeout 150
-ex {odds[0] = 1} { incr ok; exp_continue }
-ex {odds[1] = 3} { incr ok; exp_continue }
-ex {odds[3] = 7} { incr ok; exp_continue }
Index: systemtap-20070602/testsuite/systemtap.samples/lket.exp
===================================================================
--- systemtap-20070602/testsuite/systemtap.samples/lket.exp (.../vendor/usr/src) (revision 214)
+++ systemtap-20070602/testsuite/systemtap.samples/lket.exp (.../branches/kprobes/usr/src) (revision 214)
@@ -9,7 +9,7 @@ if {[info procs installtest_p]!="" && ![


eval spawn stap -v -DMAXSKIPPED=100000 -bM $srcdir/$subdir/lket.stp
set failed 1
-set timeout 180
+set timeout 1800
expect {
-re {^Pass\ ([1234]):\ [^\r]*\r\n} {
set detail "pass$expect_out(1,string)"; @@ -19,7 +19,7 @@ expect {
set detail "stap runtime";
exp_continue
}
- -re {Pass\ 5:[^\r]*\ in\ ([0-9]+)usr/([0-9]+)sys/([0-9]+)real\ ms.\r\n} {
+ -re {Pass\ 5:[^\r]*\ in\ ([0-9]+)usr/([0-9]+)sys/([0-9]+)real\ ms\.\r\n} {
set failed 0
}
-re {parse error|semantic error} {set detail "$expect_out(0,string)"}
Index: systemtap-20070602/testsuite/systemtap.samples/poll_map.exp
===================================================================
--- systemtap-20070602/testsuite/systemtap.samples/poll_map.exp (.../vendor/usr/src) (revision 214)
+++ systemtap-20070602/testsuite/systemtap.samples/poll_map.exp (.../branches/kprobes/usr/src) (revision 214)
@@ -4,7 +4,7 @@ if {![installtest_p]} { untested $test; spawn stap -g $srcdir/$subdir/poll_map.stp
set ok 0
expect {
- -timeout 90
+ -timeout 400
-ex "SUCCESS" { incr ok }
timeout { fail "$test (timeout)" }
eof { }
Index: systemtap-20070602/testsuite/systemtap.samples/arith.exp
===================================================================
--- systemtap-20070602/testsuite/systemtap.samples/arith.exp (.../vendor/usr/src) (revision 214)
+++ systemtap-20070602/testsuite/systemtap.samples/arith.exp (.../branches/kprobes/usr/src) (revision 214)
@@ -4,7 +4,7 @@ if {![installtest_p]} { untested $test; spawn stap -DMAXNESTING=5 $srcdir/$subdir/arith.stp
set ok 0
expect {
- -timeout 30
+ -timeout 150
-re {passes: [0-9]* failures: 0} { incr ok }
timeout { fail "$test (timeout)" }
eof { }
Index: systemtap-20070602/testsuite/systemtap.samples/pfaults.exp
===================================================================
--- systemtap-20070602/testsuite/systemtap.samples/pfaults.exp (.../vendor/usr/src) (revision 214)
+++ systemtap-20070602/testsuite/systemtap.samples/pfaults.exp (.../branches/kprobes/usr/src) (revision 214)
@@ -5,9 +5,8 @@ spawn stap -g $srcdir/$subdir/pfaults.st
set pid $spawn_id
set ok 0
expect {
- -timeout 30
+ -timeout 180
-re {Page fault tracking, start time[^\r\n]+\r\n} { incr ok; exp_continue }
- -timeout 30
-re {Page fault tracking, end time[^\r\n]+\r\n} { incr ok; exp_continue }
timeout { fail "$test (timeout)" }
eof { }
Index: systemtap-20070602/testsuite/systemtap.samples/symbols.exp
===================================================================
--- systemtap-20070602/testsuite/systemtap.samples/symbols.exp (.../vendor/usr/src) (revision 214)
+++ systemtap-20070602/testsuite/systemtap.samples/symbols.exp (.../branches/kprobes/usr/src) (revision 214)
@@ -4,7 +4,7 @@ if {![installtest_p]} { untested $test; spawn stap -g $srcdir/$subdir/symbols.stp
set ok 0
expect {
- -timeout 30
+ -timeout 120
-re { 0x[a-f0-9]+[^\r]*\r} { incr ok; exp_continue }
timeout { fail "$test (timeout)" }
eof { }
Index: systemtap-20070602/testsuite/systemtap.samples/queue_demo.exp
===================================================================
--- systemtap-20070602/testsuite/systemtap.samples/queue_demo.exp (.../vendor/usr/src) (revision 214)
+++ systemtap-20070602/testsuite/systemtap.samples/queue_demo.exp (.../branches/kprobes/usr/src) (revision 214)
@@ -4,7 +4,7 @@ if {![installtest_p]} { untested $test; spawn stap $srcdir/$subdir/queue_demo.stp
set ok 0
expect {
- -timeout 30
+ -timeout 240
-re {block-[^\r]*} { incr ok; exp_continue }
timeout { fail "$test (timeout)" }
eof { }
Index: systemtap-20070602/testsuite/systemtap.samples/arith_limits.exp
===================================================================
--- systemtap-20070602/testsuite/systemtap.samples/arith_limits.exp (.../vendor/usr/src) (revision 214)
+++ systemtap-20070602/testsuite/systemtap.samples/arith_limits.exp (.../branches/kprobes/usr/src) (revision 214)
@@ -4,7 +4,7 @@ if {![installtest_p]} { untested $test; spawn stap -DMAXNESTING=5 $srcdir/$subdir/arith_limits.stp
set ok 0
expect {
- -timeout 30
+ -timeout 150
-re {passes: [0-9]* failures: 0} { incr ok }
timeout { fail "$test (timeout)" }
eof { }
Index: systemtap-20070602/testsuite/systemtap.samples/args.exp
===================================================================
--- systemtap-20070602/testsuite/systemtap.samples/args.exp (.../vendor/usr/src) (revision 214)
+++ systemtap-20070602/testsuite/systemtap.samples/args.exp (.../branches/kprobes/usr/src) (revision 214)
@@ -15,7 +15,7 @@ set modname "args_[pid]"
spawn stap -k -p4 -m $modname $srcdir/$subdir/args.stp
set tmpdir NO_SUCH_FILE
expect {
- -timeout 30
+ -timeout 120
-re {Keeping temporary directory "([/a-zA-Z0-9_]*)"} { pass "$test compile";
set tmpdir $expect_out(1,string) }
timeout { fail "$test compile (timeout)" }
@@ -40,7 +40,7 @@ if [file exists $modpath] {
spawn sudo $staprunpath -d [pid] $modpath foo=hello bar=999
set ok 0
expect {
- -timeout 30
+ -timeout 120
-re {foo=hello bar=999} { incr ok }
timeout { }
eof { }
@@ -55,7 +55,7 @@ if {$ok == 1} {
spawn sudo $staprunpath -d [pid] $modpath foo=goodbye bar=0
set ok 0
expect {
- -timeout 30
+ -timeout 120
-re {foo=goodbye bar=0} { incr ok }
timeout { }
eof { }
Index: systemtap-20070602/testsuite/systemtap.samples/transport.exp
===================================================================
--- systemtap-20070602/testsuite/systemtap.samples/transport.exp (.../vendor/usr/src) (revision 214)
+++ systemtap-20070602/testsuite/systemtap.samples/transport.exp (.../branches/kprobes/usr/src) (revision 214)
@@ -4,7 +4,7 @@ if {![installtest_p]} { untested $test; spawn stap -o probe.out -DMAXACTION=1000000 $srcdir/$subdir/transport1.stp
set ok 0
expect {
- -timeout 60
+ -timeout 150
timeout { fail "$test (timeout)" }
eof { spawn $srcdir/$subdir/transport-counts probe.out
expect {
@@ -22,7 +22,7 @@ set test "transport normal - relayfs"
spawn stap -b -o probe.out -DMAXACTION=1000000 $srcdir/$subdir/transport1.stp
set ok 0
expect {
- -timeout 60
+ -timeout 150
timeout { fail "$test (timeout)" }
eof { spawn $srcdir/$subdir/transport-counts probe.out
expect {
@@ -40,7 +40,7 @@ set test "transport fill staging buffer spawn stap -o probe.out -DMAXACTION=1000000 $srcdir/$subdir/transport2.stp
set ok 0
expect {
- -timeout 60
+ -timeout 150
timeout { fail "$test (timeout)" }
eof { spawn $srcdir/$subdir/transport-counts probe.out
expect {
@@ -58,7 +58,7 @@ set test "transport fill staging buffer spawn stap -b -o probe.out -DMAXACTION=1000000 $srcdir/$subdir/transport2.stp
set ok 0
expect {
- -timeout 60
+ -timeout 150
timeout { fail "$test (timeout)" }
eof { spawn $srcdir/$subdir/transport-counts probe.out
expect {
Index: systemtap-20070602/testsuite/systemtap.samples/system_func.exp
===================================================================
--- systemtap-20070602/testsuite/systemtap.samples/system_func.exp (.../vendor/usr/src) (revision 214)
+++ systemtap-20070602/testsuite/systemtap.samples/system_func.exp (.../branches/kprobes/usr/src) (revision 214)
@@ -6,10 +6,15 @@ set done 0
set saw_user 0
set user [exec whoami]
expect {
- -timeout 30
- -re "^$user\[^\r\]*\[\r\n\]*" {incr saw_user; exp_continue}
- -re {^sys_open[^\r]*[\r\n]*} {incr open; exp_continue }
- -re {DONE[^\r]*[\r\n]*} {incr done; exp_continue }
+ -timeout 240
+ -re "($user|sys_open|DONE)\r" {
+ switch $expect_out(1,string) {
+ sys_open {incr open}
+ DONE {incr done}
+ default {incr saw_user}
+ }
+ exp_continue
+ }
timeout { fail "$test (timeout)" }
eof { }
}
Index: systemtap-20070602/testsuite/systemtap.samples/profile.exp
===================================================================
--- systemtap-20070602/testsuite/systemtap.samples/profile.exp (.../vendor/usr/src) (revision 214)
+++ systemtap-20070602/testsuite/systemtap.samples/profile.exp (.../branches/kprobes/usr/src) (revision 214)
@@ -4,7 +4,8 @@ if {![installtest_p]} { untested $test; spawn stap $srcdir/$subdir/profile.stp
set ok 0
expect {
- -timeout 60 -re {kernel.function[^\r]*ttime=[0-9]*\r} { incr ok; exp_continue }
+ -timeout 360
+ -re {kernel.function[^\r]*ttime=[0-9]*\r} { incr ok; exp_continue }
timeout { fail "$test (timeout)" }
eof { }
}
Index: systemtap-20070602/testsuite/systemtap.samples/control_limits.exp
===================================================================
--- systemtap-20070602/testsuite/systemtap.samples/control_limits.exp (.../vendor/usr/src) (revision 214)
+++ systemtap-20070602/testsuite/systemtap.samples/control_limits.exp (.../branches/kprobes/usr/src) (revision 214)
@@ -4,7 +4,8 @@ if {![installtest_p]} { untested $test; spawn stap -u -DMAXNESTING=5 $srcdir/$subdir/control_limits.stp
set ok 0
expect {
- -timeout 60 -re {ERROR.*MAXNESTING} { incr ok; exp_continue }
+ -timeout 150
+ -re {ERROR.*MAXNESTING} { incr ok; exp_continue }
timeout { fail "$test (timeout)" }
eof { }
}
@@ -14,7 +15,8 @@ set test "control_limits MAXACTION"
spawn stap -u -DMAXACTION_INTERRUPTIBLE=500 $srcdir/$subdir/control_limits.stp
set ok 0
expect {
- -timeout 60 -re {ERROR.*MAXACTION} { incr ok; exp_continue }
+ -timeout 150
+ -re {ERROR.*MAXACTION} { incr ok; exp_continue }
timeout { fail "$test (timeout)" }
eof { }
}
@@ -24,7 +26,8 @@ set test "control_limits MAXSTRINGLEN sm
spawn stap -u -DMAXSTRINGLEN=50 $srcdir/$subdir/control_limits.stp
set ok 0
expect {
- -timeout 60 -re {ERROR.*MAXSTRINGLEN reduced} { incr ok; exp_continue }
+ -timeout 150
+ -re {ERROR.*MAXSTRINGLEN reduced} { incr ok; exp_continue }
timeout { fail "$test (timeout)" }
eof { }
}
@@ -34,7 +37,8 @@ set test "control_limits MAXSTRINGLEN la
spawn stap -u -DMAXSTRINGLEN=500 $srcdir/$subdir/control_limits.stp
set ok 0
expect {
- -timeout 60 -re {ERROR.*MAXSTRINGLEN enlarged} { incr ok; exp_continue }
+ -timeout 150
+ -re {ERROR.*MAXSTRINGLEN enlarged} { incr ok; exp_continue }
timeout { fail "$test (timeout)" }
eof { }
}
Index: systemtap-20070602/testsuite/systemtap.samples/syscalls1.exp
===================================================================
--- systemtap-20070602/testsuite/systemtap.samples/syscalls1.exp (.../vendor/usr/src) (revision 214)
+++ systemtap-20070602/testsuite/systemtap.samples/syscalls1.exp (.../branches/kprobes/usr/src) (revision 214)
@@ -4,7 +4,7 @@ if {![installtest_p]} { untested $test; spawn stap -p2 $srcdir/$subdir/syscalls.stp
set ok 0
expect {
- -timeout 30
+ -timeout 180
-re {kernel.function[^\r]*sys_[^\r]*\r} { incr ok; exp_continue }
timeout { fail "$test (timeout)" }
eof { }
Index: systemtap-20070602/testsuite/systemtap.samples/syscalls2.exp
===================================================================
--- systemtap-20070602/testsuite/systemtap.samples/syscalls2.exp (.../vendor/usr/src) (revision 214)
+++ systemtap-20070602/testsuite/systemtap.samples/syscalls2.exp (.../branches/kprobes/usr/src) (revision 214)
@@ -3,7 +3,8 @@ if {![installtest_p]} { untested $test; spawn stap $srcdir/$subdir/syscalls.stp
set ok 0
expect {
- -timeout 60 -re {[0-9]* kernel.function[^\r]*\r} { incr ok; exp_continue }
+ -timeout 240
+ -re {[0-9]* kernel.function[^\r]*\r} { incr ok; exp_continue }
timeout { fail "$test (timeout)" }
eof { }
}
Index: systemtap-20070602/testsuite/systemtap.base/cache.exp
===================================================================
--- systemtap-20070602/testsuite/systemtap.base/cache.exp (.../vendor/usr/src) (revision 214)
+++ systemtap-20070602/testsuite/systemtap.base/cache.exp (.../branches/kprobes/usr/src) (revision 214)
@@ -27,10 +27,10 @@ proc stap_compile { TEST_NAME flags scri
set cached 0
set compile_errors 0
expect {
- -re {^Pass\ [1234]:[^\r]*\ in\ .*\ ms.\r\n} {exp_continue}
+ -re {^Pass\ [1234]:[^\r]*\ in\ .*\ ms\.\r\n} {exp_continue}
-re {^Pass\ [34]: using cached [^\r\n]+\r\n} {incr cached 1; exp_continue}
# pass-4 output
- -re {^/[^\r\n]+.ko\r\n} {exp_continue}
+ -re {^/[^\r\n]+\.ko\r\n} {exp_continue}
-re "compilation failed" {incr compile_errors 1; exp_continue}
-re "semantic error:" {incr compile_errors 1; exp_continue}
}
Index: systemtap-20070602/testsuite/systemtap.base/overload.exp
===================================================================
--- systemtap-20070602/testsuite/systemtap.base/overload.exp (.../vendor/usr/src) (revision 214)
+++ systemtap-20070602/testsuite/systemtap.base/overload.exp (.../branches/kprobes/usr/src) (revision 214)
@@ -25,8 +25,9 @@ proc stap_run_overload { TEST_NAME EXPEC
set cmd [concat {stap -v} $args]
eval spawn $cmd
expect {
- -re {^Pass\ [1234]: .+real\ ms.\r\n} {exp_continue}
- -re {^Pass\ ([34]): using cached .+\r\n} {exp_continue}
+ -timeout 150
+ -re {^Pass\ [1234]: [^\r]+real\ ms\.\r\n} {exp_continue}
+ -re {^Pass\ ([34]): using cached [^\r]+\r\n} {exp_continue}
-re {^Pass 5: starting run.\r\n} {exp_continue}
-re {ERROR: probe overhead exceeded threshold\r\n} {
if {$EXPECT_OVERLOAD} {
@@ -35,10 +36,11 @@ proc stap_run_overload { TEST_NAME EXPEC
fail "$TEST_NAME unexpected overload"
}
}
- -timeout 30 -re "^systemtap starting probe\r\n" {
+ -re "^systemtap starting probe\r\n" {
send "\003"


	    expect {
+		-timeout 10
		-re {^systemtap ending probe\r\n} {
		    if {$EXPECT_OVERLOAD} {
			fail "$TEST_NAME didn't receive expected overload"
Index: systemtap-20070602/testsuite/systemtap.syscall/syscall.exp
===================================================================
--- systemtap-20070602/testsuite/systemtap.syscall/syscall.exp	(.../vendor/usr/src)	(revision 214)
+++ systemtap-20070602/testsuite/systemtap.syscall/syscall.exp	(.../branches/kprobes/usr/src)	(revision 214)
@@ -12,13 +12,16 @@ proc test_procedure {} {
    # Add any other 64-bit arcvhitecture you want tested below.
    # To find tcl's platform name for your machine, run the following:
    # echo "puts $::tcl_platform(machine)" | tclsh
-    set do_64_bit_pass 0
-    if {$::tcl_platform(machine) == "x86_64" || $::tcl_platform(machine) == "ppc64" || $::tcl_platform(machine) == "s390x" } {
-	set do_64_bit_pass 1
-	set flags "additional_flags=-m64"
-    }
-    if { $::tcl_platform(machine) == "ia64" } {
-	set do_64_bit_pass 1
+
+    switch -regexp $::tcl_platform(machine) {
+	^ia64$
+	    { set do_64_bit_pass 1; set flags "" }
+	^(x86_64|ppc64|s390x)$
+	    { set do_64_bit_pass 1; set flags "additional_flags=-m64" }
+	^armv
+	    -
+	default
+	    { set do_64_bit_pass 0 }
    }

if {$do_64_bit_pass} {
@@ -40,15 +43,17 @@ proc test_procedure {} {
}
}
- set do_32_bit_pass 1
- set flags "additional_flags=-m32"
- # add any 64-bit only machines to this statement
- if { $::tcl_platform(machine) == "ia64" } {
- set do_32_bit_pass 0
- }
-
- if { $::tcl_platform(machine) == "s390x" } {
- set flags "additional_flags=-m31"
+ switch -regexp $::tcl_platform(machine) {
+ ^(x86_64|ppc64)$
+ { set do_32_bit_pass 1; set flags "additional_flags=-m32" }
+ ^s390x$
+ { set do_32_bit_pass 1; set flags "additional_flags=-m31" }
+ ^armv
+ { set do_32_bit_pass 1; set flags "" }
+ ^ia64$
+ -
+ default
+ { set do_32_bit_pass 0 }
}


    if {$do_32_bit_pass} {
Index: systemtap-20070602/testsuite/lib/systemtap.exp
===================================================================
--- systemtap-20070602/testsuite/lib/systemtap.exp	(.../vendor/usr/src)	(revision 214)
+++ systemtap-20070602/testsuite/lib/systemtap.exp	(.../branches/kprobes/usr/src)	(revision 214)
@@ -82,9 +82,9 @@ proc stap_run_batch {args} {
    }

expect { + -timeout -1
-re {[^\r]*\r} { verbose -log $expect_out(0,string); exp_continue } eof { }
- timeout { exp_continue } }
set results [wait]
verbose -log "wait results: $results"
Index: systemtap-20070602/testsuite/lib/stap_run.exp
===================================================================
--- systemtap-20070602/testsuite/lib/stap_run.exp (.../vendor/usr/src) (revision 214)
+++ systemtap-20070602/testsuite/lib/stap_run.exp (.../branches/kprobes/usr/src) (revision 214)
@@ -58,6 +58,7 @@ proc stap_run { TEST_NAME {LOAD_GEN_FUNC
-re $output {
pass "$TEST_NAME shutdown and output"
expect {
+ -timeout -1
-re {^Pass\ ([5]):[^\r]*\ in\ ([0-9]+)usr/([0-9]+)sys/([0-9]+)real\ ms\.\r\n}
{set pass$expect_out(1,string) "\t$expect_out(2,string)\t$expect_out(3,string)\t$expect_out(4,string)"
verbose -log "metric:\t$TEST_NAME $pass1$pass2$pass3$pass4$pass5"}
Index: systemtap-20070602/testsuite/lib/stap_run2.exp
===================================================================
--- systemtap-20070602/testsuite/lib/stap_run2.exp (.../vendor/usr/src) (revision 214)
+++ systemtap-20070602/testsuite/lib/stap_run2.exp (.../branches/kprobes/usr/src) (revision 214)
@@ -29,13 +29,14 @@ proc stap_run2 { TEST_NAME args } {
-timeout 180
-re {^Pass\ ([1234]):[^\r]*\ in\ ([0-9]+)usr/([0-9]+)sys/([0-9]+)real\ ms.\r\n}
{set pass$expect_out(1,string) "\t$expect_out(2,string)\t$expect_out(3,string)\t$expect_out(4,string)"; exp_continue}
- -re {^Pass\ ([34]): using cached .+\r\n}
+ -re {^Pass\ ([34]): using cached [^\r]+\r\n}
{set pass$expect_out(1,string) "\t0\t0\t0"; exp_continue}
-re {^Pass 5: starting run.\r\n} {exp_continue}
-ex $output {
pass "$TEST_NAME"
expect {
- -re {^Pass\ ([5]):[^\r]*\ in\ ([0-9]+)usr/([0-9]+)sys/([0-9]+)real\ ms.\r\n}
+ -timeout 20
+ -re {^Pass\ ([5]):[^\r]*\ in\ ([0-9]+)usr/([0-9]+)sys/([0-9]+)real\ ms\.\r\n}
{set pass$expect_out(1,string) "\t$expect_out(2,string)\t$expect_out(3,string)\t$expect_out(4,string)"
verbose -log "metric:\t$TEST_NAME $pass1$pass2$pass3$pass4$pass5"}
}
Index: systemtap-20070602/testsuite/systemtap.stress/conversions.exp
===================================================================
--- systemtap-20070602/testsuite/systemtap.stress/conversions.exp (.../vendor/usr/src) (revision 214)
+++ systemtap-20070602/testsuite/systemtap.stress/conversions.exp (.../branches/kprobes/usr/src) (revision 214)
@@ -11,10 +11,11 @@ foreach value {0 0xffffffff 0xffffffffff
set errs 0
verbose -log "exp $test $errs"
expect {
+ -timeout 180
-re {ERROR[^\r\n]*\r\n} { incr errs; exp_continue }
-re {WARNING[^\r\n]*\r\n} { incr errs; exp_continue }
eof { }
- timeout { }
+ timeout { fail "$test (timeout)" }
}
verbose -log "done exp $test $errs"
wait



Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]