From: Stan Cox <scox@redhat.com>
Date: Mon, 9 Mar 2009 00:17:10 +0000 (-0400)
Subject: Minor changes to labels.exp.
X-Git-Tag: release-0.9.6~48^2~3
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=4be9af07213db548443da4ae7ed365e98ed2b29c;p=systemtap.git

Minor changes to labels.exp.
---

diff --git a/testsuite/systemtap.base/labels.exp b/testsuite/systemtap.base/labels.exp
index 546402683..1b538dbb9 100644
--- a/testsuite/systemtap.base/labels.exp
+++ b/testsuite/systemtap.base/labels.exp
@@ -85,16 +85,16 @@ spawn sh $label_shpath
 expect {
     -re {0x[0-9a-f]*} 
 }
-set ok  0
+set nomatch 0
 spawn stap -p2 -l "process\(\"$label_exepath\"\).statement($expect_out(0,string))"
 expect {
     -timeout 180
-    -re {no match} { incr ok; exp_continue }
+    -re {semantic error: no match} { incr nomatch; exp_continue }
     timeout { fail "$test (timeout)" }
     eof { }
 }
 
-if {$ok == 0} { pass "$test exe .statement" } { xfail "$test exe .statement" }
+if {$nomatch == 0} { pass "$test exe .statement" } { fail "$test exe .statement" }
 
 set ok 0
 
@@ -136,15 +136,15 @@ spawn sh $label_shpath
 expect {
     -re {0x[0-9a-f]*} 
 }
-set ok  0
+set nomatch 0
 spawn stap -p2 -l "process\(\"$label_sopath\"\).statement($expect_out(0,string))"
 expect {
     -timeout 180
-    -re {no match} { incr ok; exp_continue }
+    -re {semantic error: no match} { incr nomatch; exp_continue }
     timeout { fail "$test (timeout)" }
     eof { }
 }
 
-if {$ok == 0} { pass "$test so .statement" } { xfail "$test so .statement" }
+if {$nomatch == 0} { pass "$test so .statement" } { fail "$test so .statement" }
 
 # catch {exec rm -f $label_srcpath $label_stppath $label_exepath}