From 72629a44d453ddbdaec22a680b207e96a5e19ec3 Mon Sep 17 00:00:00 2001
From: Dave Brolley <brolley@redhat.com>
Date: Fri, 20 Feb 2009 12:25:59 -0500
Subject: New basic tests for client/server.

---
 testsuite/systemtap.server/server.exp | 40 +++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 testsuite/systemtap.server/server.exp

(limited to 'testsuite/systemtap.server')

diff --git a/testsuite/systemtap.server/server.exp b/testsuite/systemtap.server/server.exp
new file mode 100644
index 00000000..f82abc27
--- /dev/null
+++ b/testsuite/systemtap.server/server.exp
@@ -0,0 +1,40 @@
+# Don't attempt these tests if the client/server are not available
+if {! [file exists [exec pwd]/../stap-client-connect]} then {
+    untested "Server Tests"
+    return
+ }
+
+# Start a systemtap server, if one is not already started.
+if {! [use_server_p]} then {
+    setup_server
+}
+
+# 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 "add"
+    stap_run $srcdir/systemtap.base/$test.stp no_load $all_pass_string
+}
+
+# Shudown the server, if we started it.
+if {! [use_server_p]} then {
+    shutdown_server
+}
-- 
cgit 


From e26df1cb46bf61450a3e9569cd892c91fd52c0a7 Mon Sep 17 00:00:00 2001
From: Dave Brolley <brolley@redhat.com>
Date: Fri, 20 Feb 2009 16:58:57 -0500
Subject: Check for required resources and tools before attempting tests using
 the client/server. Ensure that tests run with/without the server have unique
 names.

---
 testsuite/systemtap.server/hello.stp  |  8 ++++++++
 testsuite/systemtap.server/server.exp | 15 +++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100755 testsuite/systemtap.server/hello.stp

(limited to 'testsuite/systemtap.server')

diff --git a/testsuite/systemtap.server/hello.stp b/testsuite/systemtap.server/hello.stp
new file mode 100755
index 00000000..a1c4aacb
--- /dev/null
+++ b/testsuite/systemtap.server/hello.stp
@@ -0,0 +1,8 @@
+#! stap 
+
+probe begin
+{
+	printf("Hello ");
+	printf("From Server\n");
+	exit()
+}
diff --git a/testsuite/systemtap.server/server.exp b/testsuite/systemtap.server/server.exp
index f82abc27..c2c60b97 100644
--- a/testsuite/systemtap.server/server.exp
+++ b/testsuite/systemtap.server/server.exp
@@ -1,12 +1,10 @@
 # Don't attempt these tests if the client/server are not available
-if {! [file exists [exec pwd]/../stap-client-connect]} then {
-    untested "Server Tests"
-    return
- }
-
 # Start a systemtap server, if one is not already started.
 if {! [use_server_p]} then {
-    setup_server
+    if {! [setup_server]} then {
+	untested "Server Tests"
+	return
+    }
 }
 
 # Run the buildok tests using the server
@@ -30,8 +28,9 @@ foreach file [lsort [glob -nocomplain $srcdir/$self/*.stp]] {
 
 # If this is an installcheck, then run a basic execution test.
 if {[installtest_p]} then {
-    set test "add"
-    stap_run $srcdir/systemtap.base/$test.stp no_load $all_pass_string
+    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.
-- 
cgit