Update tests to check for uprobes instead of utrace.

* testsuite/systemtap.context/uprobe_stmt_num.exp: Change utrace test to
  uprobes test.
* testsuite/systemtap.context/uprobe_uaddr.exp: Ditto.
* testsuite/systemtap.base/bz5274.exp: Ditto.

3 files changed, 17 insertions, 16 deletions

diff --git a/testsuite/systemtap.base/bz5274.exp b/testsuite/systemtap.base/bz5274.exp
index 9bb1f7c7..8da16048 100755
--- a/testsuite/systemtap.base/bz5274.exp
+++ b/testsuite/systemtap.base/bz5274.exp
@@ -2,27 +2,28 @@ set test "./bz5274"
 set tpath "$srcdir/$subdir/$test"
 set arch [exec uname -i]
 
-if {$arch == "ppc64"} {
-	catch {exec gcc -o $test -g -m64 $srcdir/$subdir/$test.c} err
-} else {
-	catch {exec gcc -o $test -g $srcdir/$subdir/$test.c} err
-}
-
-if {$err == "" && [file exists $test]} then { pass "$test compile"
-} else {fail "$test compile"}
-
 if {! [installtest_p]} {
-    catch {exec rm -f $test}
     untested "$test -p5"
     return
 }
 
-if {![utrace_p]} {
-    catch {exec rm -f $test}
+if {![uprobes_p]} {
     untested "$test -p5"
     return
 }
 
+if {$arch == "ppc64"} {
+    catch {exec gcc -o $test -g -m64 $srcdir/$subdir/$test.c} err
+} else {
+    catch {exec gcc -o $test -g $srcdir/$subdir/$test.c} err
+}
+
+if {$err == "" && [file exists $test]} then {
+    pass "$test compile"
+} else {
+    fail "$test compile"
+}
+
 if {[catch {exec stap $tpath.stp -c "$srcdir/$subdir/$test.sh"} res]} {
     untested "$test longjmp to a uretprobed function"
     puts "$res"
diff --git a/testsuite/systemtap.context/uprobe_stmt_num.exp b/testsuite/systemtap.context/uprobe_stmt_num.exp
index fbb1126a..00fc832d 100644
--- a/testsuite/systemtap.context/uprobe_stmt_num.exp
+++ b/testsuite/systemtap.context/uprobe_stmt_num.exp
@@ -3,9 +3,9 @@
 
 set test "uprobe_stmt_num"
 
-# Only run on make installcheck and utrace present.
+# Only run on make installcheck and uprobes present.
 if {! [installtest_p]} { untested "$test"; return }
-if {! [utrace_p]} { untested "$test"; return }
+if {! [uprobes_p]} { untested "$test"; return }
 
 set testpath  "$srcdir/$subdir"
 set testsrc   "$testpath/$test.c"
diff --git a/testsuite/systemtap.context/uprobe_uaddr.exp b/testsuite/systemtap.context/uprobe_uaddr.exp
index 521dfa57..40881b0c 100644
--- a/testsuite/systemtap.context/uprobe_uaddr.exp
+++ b/testsuite/systemtap.context/uprobe_uaddr.exp
@@ -4,9 +4,9 @@
 
 set test "uprobe_uaddr"
 
-# Only run on make installcheck and utrace present.
+# Only run on make installcheck and uprobes present.
 if {! [installtest_p]} { untested "$test"; return }
-if {! [utrace_p]} { untested "$test"; return }
+if {! [uprobes_p]} { untested "$test"; return }
 
 set testpath  "$srcdir/$subdir"
 set testsrc   "$testpath/uprobe_stmt_num.c"