Merge branch 'master' of ssh://sources.redhat.com/git/systemtap

3 files changed, 53 insertions, 4 deletions

diff --git a/testsuite/systemtap.base/marker.exp b/testsuite/systemtap.base/marker.exp
index 89c0b8c3..0cacf60d 100644
--- a/testsuite/systemtap.base/marker.exp
+++ b/testsuite/systemtap.base/marker.exp
@@ -230,3 +230,48 @@ if {$kernel_markers_found == 0} {
 		    [lindex $kernel_marker_names 0] "foo"]
     stap_compile $TEST_NAME 0 $script
 }
+
+set TEST_NAME "K_MARKER18"
+if {$kernel_markers_found == 0} {
+    untested "$TEST_NAME : no kernel markers present"
+} else {
+    # Try compiling a script that prints the name string of a
+    # marker.
+    set script [format $kernel_script_arg \
+		    [lindex $kernel_marker_names 0] {\$name}]
+    stap_compile $TEST_NAME 1 $script
+}
+
+set TEST_NAME "K_MARKER19"
+if {$kernel_markers_found == 0} {
+    untested "$TEST_NAME : no kernel markers present"
+} else {
+    # Try compiling a script that writes to a marker name string
+    # (which isn't allowed).
+    set script [format $kernel_script_arg2 \
+		    [lindex $kernel_marker_names 0] {\$name}]
+    stap_compile $TEST_NAME 0 $script
+}
+
+set TEST_NAME "K_MARKER20"
+if {$kernel_markers_found == 0} {
+    untested "$TEST_NAME : no kernel markers present"
+} else {
+    # Try compiling a script that treats the marker name string as a
+    # structure (which isn't allowed).
+    set script [format $kernel_script_arg \
+		    [lindex $kernel_marker_names 0] {\$name->foo}]
+    stap_compile $TEST_NAME 0 $script
+}
+
+set TEST_NAME "K_MARKER21"
+if {$kernel_markers_found == 0} {
+    untested "$TEST_NAME : no kernel markers present"
+} else {
+    # Try compiling a script that treats the marker name string like
+    # an array (which isn't allowed).
+    set script [format $kernel_script_arg \
+		    [lindex $kernel_marker_names 0] {\$name\[0\]}]
+    stap_compile $TEST_NAME 0 $script
+}
+
diff --git a/testsuite/systemtap.base/uprobes.exp b/testsuite/systemtap.base/uprobes.exp
index a0ae3e76..8fbe6da6 100644
--- a/testsuite/systemtap.base/uprobes.exp
+++ b/testsuite/systemtap.base/uprobes.exp
@@ -26,8 +26,12 @@ spawn sudo stap -v $srcdir/$subdir/uprobes.stp -c "./jennie 1 2 3 4"
 set ok 0
 expect {
     -re {^Pass[^\r\n]*\r\n} { exp_continue }
-    -re {^process[^\r\n]*jennie[^\r\n]*main[^\r\n]*call[^\r\n]*\r\n} { incr ok; exp_continue }
-    -re {^process[^\r\n]*jennie[^\r\n]*main[^\r\n]*return[^\r\n]*\r\n} { incr ok; exp_continue }
+    -re {^Warning[^\r\n]*\r\n} { exp_continue }
+    -re {^Disabling[^\r\n]*\r\n} { exp_continue }
+    -re {^Uprobes[^\r\n]*\r\n} { exp_continue }
+    -re {^Cache[^\r\n]*\r\n} { exp_continue }
+    -re {^process[^\r\n]*jennie[^\r\n]*main[^\r\n]*call\r\n} { incr ok; exp_continue }
+    -re {^process[^\r\n]*jennie[^\r\n]*main[^\r\n]*return\r\n} { incr ok; exp_continue }
     -timeout 30
     timeout { }
     eof { }
diff --git a/testsuite/systemtap.base/uprobes.stp b/testsuite/systemtap.base/uprobes.stp
index d7efb586..8e7dbe9d 100755
--- a/testsuite/systemtap.base/uprobes.stp
+++ b/testsuite/systemtap.base/uprobes.stp
@@ -1,3 +1,3 @@
 #! stap -p4
-probe process("./jennie").function("main").call { log(pp()." "/*.$$parms*/) }
-probe process("./jennie").function("main").return { log(pp()." "/*.$$return*/) }
+probe process("./jennie").function("main").call { log(pp()/*." ".$$parms*/) }
+probe process("./jennie").function("main").return { log(pp()/*." ".$$return*/) }