2007-11-15 David Smith <dsmith@redhat.com>

	* systemtap.base/marker.exp: Removed 'module("foo").mark("bar")'
	tests since that facility was removed.

1 files changed, 4 insertions, 263 deletions

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
-}