]> sourceware.org Git - systemtap.git/commitdiff
Fixed PR14560 to avoid cmd_parse.exp hanging on RHEL5.
authorDavid Smith <dsmith@redhat.com>
Tue, 11 Sep 2012 22:24:18 +0000 (17:24 -0500)
committerDavid Smith <dsmith@redhat.com>
Tue, 11 Sep 2012 22:24:18 +0000 (17:24 -0500)
* testsuite/systemtap.base/cmd_parse.exp: Change cmd_parse14 test to use
  grep instead of expect to avoid hangs on RHEL5.

testsuite/systemtap.base/cmd_parse.exp

index d59147ef5bf08f5ff677f6e0a4438914fbe9747b..fbcf8e6e3532e959d45d1e0959124f63ac4b6d67 100644 (file)
@@ -124,13 +124,11 @@ expect {
 }
 wait;catch {close}
 
-spawn sh -c "stap -v -v --vp 01020 -h 2>&1"
-expect {
-    -re {add per-pass verbosity .23242.} { pass "cmd_parse14" }
-    timeout { fail "cmd_parse14: timeout" }
-    eof { fail "cmd_parse14: eof" }
+if {![catch { exec sh -c "stap -v -v --vp 01020 -h 2>&1 | grep -q 'add per-pass verbosity .23242.'" }]} {
+    pass "cmd_parse14"
+} else {
+    fail "cmd_parse14"
 }
-wait;catch {close}
 
 set uname [exec uname -r]
 set triplet [split $uname {.-}]
This page took 0.998366 seconds and 5 git commands to generate.