diff options
Diffstat (limited to 'testsuite/systemtap.base')
| -rw-r--r-- | testsuite/systemtap.base/add.stp | 10 | ||||
| -rw-r--r-- | testsuite/systemtap.base/array_size.stp | 6 | ||||
| -rw-r--r-- | testsuite/systemtap.base/be_order.stp | 8 | ||||
| -rw-r--r-- | testsuite/systemtap.base/deref.stp | 6 | ||||
| -rw-r--r-- | testsuite/systemtap.base/deref2.stp | 4 | ||||
| -rw-r--r-- | testsuite/systemtap.base/equal.stp | 14 | ||||
| -rw-r--r-- | testsuite/systemtap.base/finloop2.stp | 12 | ||||
| -rw-r--r-- | testsuite/systemtap.base/global_init.stp | 8 | ||||
| -rw-r--r-- | testsuite/systemtap.base/if.stp | 12 | ||||
| -rw-r--r-- | testsuite/systemtap.base/inc.stp | 24 | ||||
| -rw-r--r-- | testsuite/systemtap.base/kfunct.stp | 6 | ||||
| -rw-r--r-- | testsuite/systemtap.base/kmodule.stp | 6 | ||||
| -rw-r--r-- | testsuite/systemtap.base/logical_and.stp | 22 | ||||
| -rw-r--r-- | testsuite/systemtap.base/marker.exp | 267 | ||||
| -rw-r--r-- | testsuite/systemtap.base/not.stp | 12 | ||||
| -rw-r--r-- | testsuite/systemtap.base/print.stp | 39 | ||||
| -rw-r--r-- | testsuite/systemtap.base/prologues.stp | 2 | ||||
| -rw-r--r-- | testsuite/systemtap.base/simple.stp | 4 | ||||
| -rw-r--r-- | testsuite/systemtap.base/tri.stp | 16 |
19 files changed, 112 insertions, 366 deletions
diff --git a/testsuite/systemtap.base/add.stp b/testsuite/systemtap.base/add.stp index 3fa7be38..8ae46f10 100644 --- a/testsuite/systemtap.base/add.stp +++ b/testsuite/systemtap.base/add.stp @@ -1,7 +1,7 @@ /* * add.stp * - * Check the systemtap "addition" works + * Check that systemtap "addition" works */ global x3 @@ -10,17 +10,17 @@ global x2 probe begin { - log("systemtap starting probe") + println("systemtap starting probe") x1 = 42; x2 = 53; } probe end { - log("systemtap ending probe") + println("systemtap ending probe") x3 = x1 + x2; if (x3 != 95 ) { - log("systemtap test failure"); + println("systemtap test failure") } else { - log("systemtap test success"); + println("systemtap test success") } } diff --git a/testsuite/systemtap.base/array_size.stp b/testsuite/systemtap.base/array_size.stp index cf597a61..7b457247 100644 --- a/testsuite/systemtap.base/array_size.stp +++ b/testsuite/systemtap.base/array_size.stp @@ -6,8 +6,8 @@ * Call with MAXMAPENTRIES << 100 */ -probe begin { log("systemtap starting probe") } -probe end { log("systemtap ending probe") } +probe begin { println("systemtap starting probe") } +probe end { println("systemtap ending probe") } global a[100] @@ -24,7 +24,7 @@ probe end(1) { ++bad } if (ok == 100 && bad == 0) - log("systemtap test success") + println("systemtap test success") else printf("systemtap test failure - ok:%d, bad:%d\n", ok, bad) } diff --git a/testsuite/systemtap.base/be_order.stp b/testsuite/systemtap.base/be_order.stp index 166d0dca..57effb1f 100644 --- a/testsuite/systemtap.base/be_order.stp +++ b/testsuite/systemtap.base/be_order.stp @@ -4,8 +4,8 @@ * Check that ordering of begin/end probes works */ -probe begin { log("systemtap starting probe") } -probe end { log("systemtap ending probe") } +probe begin { println("systemtap starting probe") } +probe end { println("systemtap ending probe") } global beginstr, endstr @@ -24,12 +24,12 @@ probe end(9223372036854775807) { endstr .= "z" if (beginstr == "abccde") - log("systemtap test success") + println("systemtap test success") else printf("systemtap test failure - beginstr:%s != abccde\n", beginstr) if (endstr == "vwxxyz") - log("systemtap test success") + println("systemtap test success") else printf("systemtap test failure - endstr:%s != vwxxyz\n", endstr) } diff --git a/testsuite/systemtap.base/deref.stp b/testsuite/systemtap.base/deref.stp index b003d657..3f76bfb6 100644 --- a/testsuite/systemtap.base/deref.stp +++ b/testsuite/systemtap.base/deref.stp @@ -4,8 +4,8 @@ * Check that the deref mechanisms work correctly. */ -probe begin { log("systemtap starting probe") } -probe end { log("systemtap ending probe") } +probe begin { println("systemtap starting probe") } +probe end { println("systemtap ending probe") } probe end(1) { log_test("kread u8", kread_u8()) @@ -29,7 +29,7 @@ probe end(1) { function log_test(test:string, result:long) { if (result) - log("systemtap test success") + println("systemtap test success") else printf("systemtap test failure - %s\n", test) } diff --git a/testsuite/systemtap.base/deref2.stp b/testsuite/systemtap.base/deref2.stp index aa59490c..0008bae7 100644 --- a/testsuite/systemtap.base/deref2.stp +++ b/testsuite/systemtap.base/deref2.stp @@ -3,7 +3,7 @@ # It's just an ordinary function that returns a 4-byte signed value, # even on a 64-bit hosts. probe kernel.function("sock_alloc_fd").return { - log ($return < 0 ? "neg" : "pos") + println ($return < 0 ? "neg" : "pos") } probe timer.s (5) { exit () } -probe begin { log ("start") }
\ No newline at end of file +probe begin { println ("start") } diff --git a/testsuite/systemtap.base/equal.stp b/testsuite/systemtap.base/equal.stp index 83ca0115..0333307a 100644 --- a/testsuite/systemtap.base/equal.stp +++ b/testsuite/systemtap.base/equal.stp @@ -7,22 +7,22 @@ global count global count2 -probe begin { log("systemtap starting probe") } +probe begin { println("systemtap starting probe") } probe kernel.function("schedule") { ++count; ++count2; } probe end { - log("systemtap ending probe") - log("count = " . sprint(count)); - log("count2 = " . sprint(count)); + println("systemtap ending probe") + printf("count = %d\n", count) + printf("count2 = %d\n", count) if ( count == count2) { if ( (count-1) == count2 ) { - log("systemtap test failure"); + println("systemtap test failure"); } else { - log("systemtap test success"); + println("systemtap test success"); } } else { - log("systemtap test failure"); + println("systemtap test failure"); } } diff --git a/testsuite/systemtap.base/finloop2.stp b/testsuite/systemtap.base/finloop2.stp index 8f12fd8a..b675be41 100644 --- a/testsuite/systemtap.base/finloop2.stp +++ b/testsuite/systemtap.base/finloop2.stp @@ -10,7 +10,7 @@ global loop_count probe begin { - log("systemtap starting probe") + println("systemtap starting probe") } probe kernel.function("schedule") @@ -23,12 +23,12 @@ probe kernel.function("schedule") probe end { - log("systemtap ending probe") - log("count = " . sprint(count)); - log("loop_count = " . sprint(loop_count)); + println("systemtap ending probe") + printf("count = %d\n", count) + printf("loop_count = %d\n", loop_count) if ( count * 10 == loop_count) { - log("systemtap test success"); + println("systemtap test success"); } else { - log("systemtap test failure"); + println("systemtap test failure"); } } diff --git a/testsuite/systemtap.base/global_init.stp b/testsuite/systemtap.base/global_init.stp index a5d7e58e..30478846 100644 --- a/testsuite/systemtap.base/global_init.stp +++ b/testsuite/systemtap.base/global_init.stp @@ -4,8 +4,8 @@ * Check that global variables are initialized before all begin probes */ -probe begin { log("systemtap starting probe") } -probe end { log("systemtap ending probe") } +probe begin { println("systemtap starting probe") } +probe end { println("systemtap ending probe") } global gnum = 42 global gstr = "foobar" @@ -19,12 +19,12 @@ probe begin(-9223372036854775808) { probe end { if (gnum_saved == 42) - log("systemtap test success") + println("systemtap test success") else printf("systemtap test failure - gnum_saved:%d != 42\n", gnum_saved) if (gstr_saved == "foobar") - log("systemtap test success") + println("systemtap test success") else printf("systemtap test failure - gstr_saved:%s != foobar\n", gstr_saved) } diff --git a/testsuite/systemtap.base/if.stp b/testsuite/systemtap.base/if.stp index bcbafd51..fa4da54d 100644 --- a/testsuite/systemtap.base/if.stp +++ b/testsuite/systemtap.base/if.stp @@ -4,19 +4,19 @@ * Check the systemtap if statement works */ -probe begin { log("systemtap starting probe") } +probe begin { println("systemtap starting probe") } probe end { - log("systemtap ending probe") + println("systemtap ending probe") if (1) { - log("systemtap test success"); + println("systemtap test success"); } else { - log("systemtap test failure"); + println("systemtap test failure"); } if (0) { - log("systemtap test failure"); + println("systemtap test failure"); } else { - log("systemtap test success"); + println("systemtap test success"); } } diff --git a/testsuite/systemtap.base/inc.stp b/testsuite/systemtap.base/inc.stp index f37b2cee..17d6dc7c 100644 --- a/testsuite/systemtap.base/inc.stp +++ b/testsuite/systemtap.base/inc.stp @@ -1,24 +1,28 @@ /* * inc.stp * - * Check the systemtap ++ works + * Check that systemtap ++ works */ global x1 probe begin { - log("systemtap starting probe"); - x1 = 41; + println("systemtap starting probe") + x1 = 41 } probe end { - log("systemtap ending probe"); - ++x1; - if (x1 != 42 ) { - log("systemtap test failure"); - } else { - log("systemtap test success"); - } + println("systemtap ending probe") + x1++ + if (x1 == 42) { + ++x1 + if (x1 != 43 ) { + println("systemtap test failure") + } else { + println("systemtap test success") + } + } else + println("systemtap test failure") } diff --git a/testsuite/systemtap.base/kfunct.stp b/testsuite/systemtap.base/kfunct.stp index 15be51bd..93031395 100644 --- a/testsuite/systemtap.base/kfunct.stp +++ b/testsuite/systemtap.base/kfunct.stp @@ -9,7 +9,7 @@ global count probe begin { - log("systemtap starting probe") + println("systemtap starting probe") } probe kernel.function("schedule") @@ -19,6 +19,6 @@ probe kernel.function("schedule") probe end { - log("systemtap ending probe") - log("count = " . sprint(count)); + println("systemtap ending probe") + printf("count = %d\n", count) } diff --git a/testsuite/systemtap.base/kmodule.stp b/testsuite/systemtap.base/kmodule.stp index 9c718f29..19241cab 100644 --- a/testsuite/systemtap.base/kmodule.stp +++ b/testsuite/systemtap.base/kmodule.stp @@ -9,7 +9,7 @@ global count probe begin { - log("systemtap starting probe") + println("systemtap starting probe") } probe module("ext3").function("ext3_sync_file") ?, @@ -22,6 +22,6 @@ probe module("ext3").function("ext3_sync_file") ?, probe end { - log("systemtap ending probe") - log("count = " . sprint(count)); + println("systemtap ending probe") + println("count = " . sprint(count)); } diff --git a/testsuite/systemtap.base/logical_and.stp b/testsuite/systemtap.base/logical_and.stp index 5017190b..3f4961b4 100644 --- a/testsuite/systemtap.base/logical_and.stp +++ b/testsuite/systemtap.base/logical_and.stp @@ -1,7 +1,7 @@ /* * logical_and.stp * - * Check the systemtap "logical and" works + * Check that systemtap "logical and" works */ global x1_0 @@ -11,31 +11,31 @@ global x4_1 probe begin { - log("systemtap starting probe") + println("systemtap starting probe") x1_0 = 0; x2_1 = 1; x3_0 = 0; x4_1 = 1; } probe end { - log("systemtap ending probe") + println("systemtap ending probe") if (x1_0 && x3_0 ) { - log("systemtap test failure"); + println("systemtap test failure"); } else { - log("systemtap test success"); + println("systemtap test success"); } if (x2_1 && x3_0 ) { - log("systemtap test failure"); + println("systemtap test failure"); } else { - log("systemtap test success"); + println("systemtap test success"); } if (x1_0 && x4_1 ) { - log("systemtap test failure"); + println("systemtap test failure"); } else { - log("systemtap test success"); + println("systemtap test success"); } if (x2_1 && x4_1 ) { - log("systemtap test success"); + println("systemtap test success"); } else { - log("systemtap test failure"); + println("systemtap test failure"); } } diff --git a/testsuite/systemtap.base/marker.exp b/testsuite/systemtap.base/marker.exp index 3ea909fd..3dc0a6bf 100644 --- a/testsuite/systemtap.base/marker.exp +++ b/testsuite/systemtap.base/marker.exp @@ -43,75 +43,27 @@ proc stap_compile { TEST_NAME compile script args } { } } -# find_non_matching_module MODULE -# - MODULE specifies the input module name -# find_non_matching_module finds a module name that isn't MODULE -proc find_non_matching_module { MODULE } { - global module_marker_modules - - # Look through $module_marker_modules (the list of all modules - # that have markers in them) for a module name that isn't MODULE. - foreach m $module_marker_modules { - if {$m != $MODULE} { - return $m - } - } - - # If we're here, there was only one loaded module with markers. - # But, we still need the name of a module. So, look through - # /proc/modules. Unless there is only one module loaded, this - # will find something to return. - set module_name "" - set fl [open "/proc/modules"] - while {[gets $fl s] >= 0} { - if [regexp {^([^ ]+)} $s match m] { - if {$m != $MODULE} { - set module_name $m - break - } - } - } - catch {close $fl} - return $module_name -} - # Initialize variables set kernel_markers_found 0 set kernel_marker_names {} -set module_markers_found 0 -set module_marker_modules {} -set module_marker_names {} set kernel_script {"probe kernel.mark(\"%s\") { }"} set kernel_script_arg {"probe kernel.mark(\"%s\") { print(%s) }"} set kernel_script_arg2 {"probe kernel.mark(\"%s\") { %s = 0 }"} -set module_script {"probe module(\"%s\").mark(\"%s\") { }"} -set module_script_arg {"probe module(\"%s\").mark(\"%s\") { print(%s) }"} -set module_script_arg2 {"probe module(\"%s\").mark(\"%s\") { %s = 0 }"} - -set km_script {"probe kernel.mark(\"%s\"), module(\"%s\").mark(\"%s\") { }"} - # Try to figure out if kernel markers are present in the kernel itself # or in any loaded module set fl [open "| egrep __mark_.+\.\[0-9\]+ /proc/kallsyms"] while {[gets $fl s] >= 0} { - if [regexp {__mark_([^.]+)\.[0-9]+(\t+\[(.+)\])?} $s match name subexp module] { - puts "$name $subexp $module" - if {$module == ""} { - set kernel_markers_found 1 - lappend kernel_marker_names $name - } else { - set module_markers_found 1 - lappend module_marker_modules $module - lappend module_marker_names $name - } + if [regexp {__mark_([^.]+)\.[0-9]+\t?} $s match name subexp module] { + set kernel_markers_found 1 + lappend kernel_marker_names $name } } catch {close $fl} # -# Do some kernel-only (non-module) marker tests. +# Do some marker tests. # set TEST_NAME "K_MARKER01" @@ -200,214 +152,3 @@ if {$kernel_markers_found == 0} { [lindex $kernel_marker_names 0] {\$arg1}] stap_compile $TEST_NAME 0 $script } - -set TEST_NAME "K_MARKER09" -if {$kernel_markers_found == 0} { - untested "$TEST_NAME : no kernel markers present" -} else { - # Try compiling a script that looks for the first kernel marker in - # a module (which should fail). - - # Find a kernel marker name that doesn't exist as a module marker - # name. - set found 0 - foreach mark_name $kernel_marker_names { - if {[lsearch -exact $module_marker_names $mark_name] == -1} { - set found 1 - break - } - } - - if {$found} { - set script [format $module_script "*" $mark_name] - stap_compile $TEST_NAME 0 $script - } else { - untested "$TEST_NAME : no unique kernel markers present" - } -} - -# -# Do some module-only marker tests, basically duplicating the -# kernel-only tests. This is for the case where the kernel proper -# doesn't have any markers, but module(s) do. -# - -set TEST_NAME "M_MARKER01" -if {$module_markers_found == 0} { - untested "$TEST_NAME : no module markers present" -} else { - # Try compiling a script that probes all module markers using - # wildcards. - set script [format $module_script "*" "*"] - stap_compile $TEST_NAME 1 $script -} - -set TEST_NAME "M_MARKER02" -if {$module_markers_found == 0} { - untested "$TEST_NAME : no module markers present" -} else { - # Try compiling a script that probes all module markers in a - # particular module. - set script [format $module_script [lindex $module_marker_modules 0] "*"] - stap_compile $TEST_NAME 1 $script -} - -set TEST_NAME "M_MARKER03" -if {$module_markers_found == 0} { - untested "$TEST_NAME : no module markers present" -} else { - # Try compiling a script that probes a particular marker in all - # modules. - set script [format $module_script "*" [lindex $module_marker_names 0]] - stap_compile $TEST_NAME 1 $script -} - -set TEST_NAME "M_MARKER04" -if {$module_markers_found == 0} { - untested "$TEST_NAME : no module markers present" -} else { - # Try compiling a script that probes a particular marker in a - # particular module. - set script [format $module_script \ - [lindex $module_marker_modules 0] \ - [lindex $module_marker_names 0]] - stap_compile $TEST_NAME 1 $script -} - -set TEST_NAME "M_MARKER05" -if {$module_markers_found == 0} { - untested "$TEST_NAME : no module markers present" -} else { - # Try compiling a script that probes a particular marker in the - # wrong module. - set wrong_module [find_non_matching_module \ - [lindex $module_marker_modules 0]] - set script [format $module_script $wrong_module \ - [lindex $module_marker_names 0]] - stap_compile $TEST_NAME 0 $script -} - -set TEST_NAME "M_MARKER06" -if {$module_markers_found == 0} { - untested "$TEST_NAME : no module markers present" -} else { - # Try compiling a script that probes a marker that doesn't exist - # in all modules. - set script [format $module_script "*" "X_marker_that_does_not_exist_X"] - stap_compile $TEST_NAME 0 $script -} - -set TEST_NAME "M_MARKER07" -if {$module_markers_found == 0} { - untested "$TEST_NAME : no module markers present" -} else { - # Try compiling a script that prints the first argument of a - # marker. This one might fail if the marker we pick doesn't have - # any arguments. - set script [format $module_script_arg \ - [lindex $module_marker_modules 0] \ - [lindex $module_marker_names 0] {\$arg1}] - stap_compile $TEST_NAME 1 $script -} - -set TEST_NAME "M_MARKER08" -if {$module_markers_found == 0} { - untested "$TEST_NAME : no module markers present" -} else { - # Try compiling a script that prints an marker argument that - # doesn't exist. This one might fail if the marker we pick - # has a 200th argument (which isn't likely). - set script [format $module_script_arg \ - [lindex $module_marker_modules 0] \ - [lindex $module_marker_names 0] {\$arg200}] - stap_compile $TEST_NAME 0 $script -} - -set TEST_NAME "M_MARKER09" -if {$module_markers_found == 0} { - untested "$TEST_NAME : no module markers present" -} else { - # Try compiling a script that prints marker argument $arg0 - # (which doesn't exist). - set script [format $module_script_arg \ - [lindex $module_marker_modules 0] \ - [lindex $module_marker_names 0] {\$arg0}] - stap_compile $TEST_NAME 0 $script -} - -set TEST_NAME "M_MARKER10" -if {$module_markers_found == 0} { - untested "$TEST_NAME : no module markers present" -} else { - # Try compiling a script that prints marker argument $foo1 (which - # doesn't exist). - set script [format $module_script_arg \ - [lindex $module_marker_modules 0] \ - [lindex $module_marker_names 0] {\$foo1}] - stap_compile $TEST_NAME 0 $script -} - -set TEST_NAME "M_MARKER11" -if {$module_markers_found == 0} { - untested "$TEST_NAME : no module markers present" -} else { - # Try compiling a script that writes to marker argument $arg1 - # (which isn't allowed). - set script [format $module_script_arg2 \ - [lindex $module_marker_modules 0] \ - [lindex $module_marker_names 0] {\$arg1}] - stap_compile $TEST_NAME 0 $script -} - -set TEST_NAME "M_MARKER12" -if {$module_markers_found == 0} { - untested "$TEST_NAME : no module markers present" -} else { - # Try compiling a script that looks for the a module marker as - # a kernel marker (which should fail). - - # Find a module marker name that doesn't also exist as a kernel - # marker name. - set found 0 - foreach mark_name $module_marker_names { - if {[lsearch -exact $kernel_marker_names $mark_name] == -1} { - set found 1 - break - } - } - - if {$found} { - set script [format $kernel_script $mark_name] - stap_compile $TEST_NAME 0 $script - } else { - untested "$TEST_NAME : no unique module markers present" - } -} - -# -# If we have both kernel and module markers present, try a few -# combined tests. -# - -set TEST_NAME "KM_MARKER01" -if {$kernel_markers_found == 0 && $module_markers_found == 0} { - untested "$TEST_NAME : both kernel and module markers are not present" -} else { - # Try compiling a script that probes all kernel and all module - # markers. - set script [format $km_script "*" "*" "*"] - stap_compile $TEST_NAME 1 $script -} - -set TEST_NAME "KM_MARKER02" -if {$kernel_markers_found == 0 && $module_markers_found == 0} { - untested "$TEST_NAME : both kernel and module markers are not present" -} else { - # Try compiling a script that probes the first kernel and module - # markers found - set script [format $km_script \ - [lindex $kernel_marker_names 0] \ - [lindex $module_marker_modules 0] \ - [lindex $module_marker_names 0]] - stap_compile $TEST_NAME 1 $script -} diff --git a/testsuite/systemtap.base/not.stp b/testsuite/systemtap.base/not.stp index 3e1bbd50..166346df 100644 --- a/testsuite/systemtap.base/not.stp +++ b/testsuite/systemtap.base/not.stp @@ -1,24 +1,24 @@ /* * neg.stp * - * Check the systemtap negation works + * Check that systemtap negation works */ global x2, x1 probe begin { - log("systemtap starting probe") + println("systemtap starting probe") x1 = 0xaaaaaaaaaaaaaaaa } probe end { - log("systemtap ending probe") - x2 = ~x1; + println("systemtap ending probe") + x2 = ~x1 if ( x2 != 0x5555555555555555 ) { - log("systemtap test failure"); + println("systemtap test failure") } else { - log("systemtap test success"); + println("systemtap test success") } } diff --git a/testsuite/systemtap.base/print.stp b/testsuite/systemtap.base/print.stp index e1b64c35..161be4b4 100644 --- a/testsuite/systemtap.base/print.stp +++ b/testsuite/systemtap.base/print.stp @@ -8,32 +8,33 @@ global s1, s2, s3 probe begin { - log("systemtap starting probe") - s1 = "systemtap" - s2 = "test" - s3 = "success" + println("systemtap starting probe") + s1 = "systemtap" + s2 = "test" + s3 = "success" } probe end { - log("systemtap ending probe") + println("systemtap ending probe") - print(s1, " ", s2, " ", s3, "\n") - print(sprint(s1, " ", s2, " ", s3, "\n")) + print(s1, " ", s2, " ", s3, "\n") + print(sprint(s1, " ", s2, " ", s3, "\n")) - println(s1, " ", s2, " ", s3) - print(sprintln(s1, " ", s2, " ", s3)) + println(s1, " ", s2, " ", s3) + print(sprintln(s1, " ", s2, " ", s3)) - printd(" ", s1, s2, s3 . "\n") - print(sprintd(" ", s1, s2, s3 . "\n")) + printd(" ", s1, s2, s3 . "\n") + print(sprintd(" ", s1, s2, s3 . "\n")) - printdln(" ", s1, s2, s3) - print(sprintdln(" ", s1, s2, s3)) + printdln(" ", s1, s2, s3) + print(sprintdln(" ", s1, s2, s3)) - // check that formatting characters get escaped correctly in the delimiter - s = sprintd("%% % \\ \"", 1, 2, 3) - if (s == "1%% % \\ \"2%% % \\ \"3") - log("systemtap test success") - else - log("systemtap test failure") + // Check that formatting characters get escaped correctly + // in the delimiter. + s = sprintd("%% % \\ \"", 1, 2, 3) + if (s == "1%% % \\ \"2%% % \\ \"3") + println("systemtap test success") + else + println("systemtap test failure") } diff --git a/testsuite/systemtap.base/prologues.stp b/testsuite/systemtap.base/prologues.stp index fc32ccd9..cbda14f9 100644 --- a/testsuite/systemtap.base/prologues.stp +++ b/testsuite/systemtap.base/prologues.stp @@ -1,6 +1,6 @@ # These sys_ functions often display prologue sensitivity probe syscall.read, syscall.write { - log (name . argstr) + printf("%s (%s)\n", name, argstr) if (num++ > 20) exit() } global num diff --git a/testsuite/systemtap.base/simple.stp b/testsuite/systemtap.base/simple.stp index 28a81cff..ee8a97a8 100644 --- a/testsuite/systemtap.base/simple.stp +++ b/testsuite/systemtap.base/simple.stp @@ -7,10 +7,10 @@ probe begin { - log("systemtap starting probe") + println("systemtap starting probe") } probe end { - log("systemtap ending probe") + println("systemtap ending probe") } diff --git a/testsuite/systemtap.base/tri.stp b/testsuite/systemtap.base/tri.stp index 80aed1e7..92b78801 100644 --- a/testsuite/systemtap.base/tri.stp +++ b/testsuite/systemtap.base/tri.stp @@ -8,29 +8,29 @@ global x1, x2, x3, x4, x5, x6 probe begin { - log("systemtap starting probe"); + println("systemtap starting probe"); x1 = 0; x2 = 1; x3=30; } probe end { - log("systemtap ending probe") + println("systemtap ending probe") x4 = x1 ? 9: 10; x5 = x2 ? 99: 100; x6 = x3 ? 999: 1000; if (x4 != 10 ) { - log("systemtap test failure"); + println("systemtap test failure"); } else { - log("systemtap test success"); + println("systemtap test success"); } if (x5 != 99 ) { - log("systemtap test failure"); + println("systemtap test failure"); } else { - log("systemtap test success"); + println("systemtap test success"); } if (x6 != 999 ) { - log("systemtap test failure"); + println("systemtap test failure"); } else { - log("systemtap test success"); + println("systemtap test success"); } } |