3 files changed, 5 insertions, 3 deletions
diff --git a/testsuite/systemtap.samples/ioblocktest.exp b/testsuite/systemtap.samples/ioblocktest.exp
index 43c44f5e..e80ec757 100644
--- a/testsuite/systemtap.samples/ioblocktest.exp
+++ b/testsuite/systemtap.samples/ioblocktest.exp
@@ -8,5 +8,5 @@ proc sleep_ten_secs {} {
     return 0;
 }
 
-set output_string "\\mioblock*"
+set output_string "ioblock: \\S+\t\\d+\t\[RW]\t\[01]\r\n"
 stap_run $srcdir/$subdir/$test.stp sleep_ten_secs $output_string
diff --git a/testsuite/systemtap.samples/ioblocktest.stp b/testsuite/systemtap.samples/ioblocktest.stp
index 1386903c..43b3e7d0 100644
--- a/testsuite/systemtap.samples/ioblocktest.stp
+++ b/testsuite/systemtap.samples/ioblocktest.stp
@@ -10,5 +10,5 @@ probe ioblock.end {
 }
 probe end { 
    log("systemtap ending probe")
-   printf("%s\n", teststr)
+   printf("%s", teststr)
 }
diff --git a/testsuite/systemtap.samples/tcptest.exp b/testsuite/systemtap.samples/tcptest.exp
index 0c40f93d..0ae088ef 100644
--- a/testsuite/systemtap.samples/tcptest.exp
+++ b/testsuite/systemtap.samples/tcptest.exp
@@ -7,5 +7,7 @@ proc tcp_gen { } {
    exec $::tcp_tcl 1 
    return 0
 }
-set output_string "\\mTCP totalbytes: \\d+\\M"
+set output_header "UID\tPID\tSIZE\tNAME\t\t\tPORT\tSOURCE\t\tRTO\tRCVMSS\tSSTHRES\tCWND\tSTATE\r\n"
+set output_rows "((\\d+\t\\d+\t\\d+\t\\S+\t\t\t\\d+\t\\S*\t\\d+\t\\d+\t\\d+\t\\d+\t\\d+)?\r\n){5}"
+set output_string "TCP totalbytes: \\d+\r\n$output_header$output_rows"
 stap_run $srcdir/$subdir/$test.stp tcp_gen $output_string