From d833f810e4ffaf5c9c16eebc7f10b9d14e53e508 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@redhat.com>
Date: Wed, 16 Sep 2009 12:59:50 +0200
Subject: Make labels -l .label test independent of list output order.

* testsuite/systemtap.base/labels.exp (-l .label): List all output lines
  individually in expect regex.
---
 testsuite/systemtap.base/labels.exp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'testsuite/systemtap.base')

diff --git a/testsuite/systemtap.base/labels.exp b/testsuite/systemtap.base/labels.exp
index 79e3f483..f759beef 100644
--- a/testsuite/systemtap.base/labels.exp
+++ b/testsuite/systemtap.base/labels.exp
@@ -93,12 +93,19 @@ wait
 set ok 0
 expect {
     -timeout 180
-    -re {process.*function.*labels.c:5...label..init_an_int.*process.*function.*labels.c:16...label..init_an_int.*process.*function.*labels.c:18...label..init_an_int_again} { incr ok; exp_continue }
+    -re {^process[^\r\n]*function[^\r\n]*labels.c:5...label..init_an_int..\r\n}
+	{ incr ok; exp_continue }
+    -re {^process[^\r\n]*function[^\r\n]*labels.c:16...label..init_an_int..\r\n}
+	{ incr ok; exp_continue }
+    -re {^process[^\r\n]*function[^\r\n]*labels.c:18...label..init_an_int_again..\r\n}
+	{ incr ok; exp_continue }
+    -re {^process[^\r\n]*function[^\r\n]*labels.c:21...label..ptr_inited..\r\n}
+	{ incr ok; exp_continue }
     timeout { fail "$test (timeout)" }
     eof { }
 }
 
-if {$ok == 1} { pass "$test -l .label" } { fail "$test -l .label $ok" }
+if {$ok == 4} { pass "$test -l .label" } { fail "$test -l .label $ok" }
 
 # label in an executable
 
-- 
cgit