--modinfo testsuite

tweak expect clauses to consume all lines

diff --git a/testsuite/systemtap.base/modinfo.exp b/testsuite/systemtap.base/modinfo.exp
index cacfbb886a6f389e492e98683691ab697fdb4fd8..c724344002f90a9c66557932d0a277bd0a782883 100644 (file)
--- a/testsuite/systemtap.base/modinfo.exp
+++ b/testsuite/systemtap.base/modinfo.exp
@@ -5,7 +5,11 @@ if [file exists $module] { pass "$test compilation" } else { fail "$test compila
 
 set ok 0
 set ko 0
-spawn modinfo $module {
-    -re {^foo:[ \t]*bar\r\n} { incr ok; exp_continue }
+spawn modinfo $module
+expect {
+    -re {^foo:[ ]*bar\r\n} { incr ok; exp_continue }
+    -re {^[a-zA-Z0-9_]*:[^\r\n]*\r\n} { exp_continue }
+    eof { }
 }
-if {$ok == 1} { pass "$test modinfo" } else { fail "$test modinfo" }
+catch { close }; catch { wait }
+if {$ok == 1} { pass "$test modinfo" } else { fail "$test modinfo ($ok $ko)" }