Merge branch 'master' into pr6866

Resolved conflicts:
	runtime/task_finder.c: name vs path.

1 files changed, 39 insertions, 0 deletions

diff --git a/testsuite/systemtap.server/server.exp b/testsuite/systemtap.server/server.exp
new file mode 100644
index 00000000..c2c60b97
--- /dev/null
+++ b/testsuite/systemtap.server/server.exp
@@ -0,0 +1,39 @@
+# Don't attempt these tests if the client/server are not available
+# Start a systemtap server, if one is not already started.
+if {! [use_server_p]} then {
+    if {! [setup_server]} then {
+	untested "Server Tests"
+	return
+    }
+}
+
+# Run the buildok tests using the server
+set self buildok
+foreach file [lsort [glob -nocomplain $srcdir/$self/*.stp]] {
+    set test "$self/[file tail $file] with server"
+    verbose -log "Running $file"
+    set rc [stap_run_batch $file]
+    # some tests are known to fail.
+    switch $test {
+        "buildok/perfmon01.stp with server" {setup_kfail 909 *-*-*}
+        "buildok/twentysix.stp with server" {setup_kfail 4105 *-*-*}
+        "buildok/twentyseven.stp with server" {setup_kfail 4166 *-*-*}
+        "buildok/sched_test.stp with server" {setup_kfail 1155 *-*-*}
+        "buildok/process_test.stp with server" {setup_kfail 1155 *-*-*}
+        "buildok/rpc-all-probes.stp with server" {setup_kfail 4413 *-*-*}
+        "buildok/nfs-all-probes.stp with server" {setup_kfail 4413 *-*-*}
+    }
+    if {$rc == 0} { pass $test } else { fail $test }
+}
+
+# If this is an installcheck, then run a basic execution test.
+if {[installtest_p]} then {
+    set test "Hello from server"
+    set rc [stap_run_batch $srcdir/systemtap.server/hello.stp]
+    if {$rc == 0} { pass $test } else { fail $test }
+}
+
+# Shudown the server, if we started it.
+if {! [use_server_p]} then {
+    shutdown_server
+}