Client argument handling:

Pass partial options to the server instead of complaining about
them in the client.

Update known failures from buildok in server.exp.

2 files changed, 9 insertions, 11 deletions

diff --git a/stap-client b/stap-client
index fa11fef0..a3b37e68 100755
--- a/stap-client
+++ b/stap-client
@@ -2,7 +2,7 @@
 
 # Compile server client for systemtap
 #
-# Copyright (C) 2008, 2009 Red Hat Inc.
+# Copyright (C) 2008, 2009, 2010 Red Hat Inc.
 #
 # This file is part of systemtap, and is free software.  You can
 # redistribute it and/or modify it under the terms of the GNU General
@@ -289,11 +289,8 @@ function get_arg {
 	first=$1
     fi
 
-    test "X$first" != "X" || \
-	fatal "Missing argument to -$opt"
-
     stap_arg="$first"
-    advance_p=$(($advance_p + 1))
+    test "X$first" != "X" && advance_p=$(($advance_p + 1))
 }
 
 # function: process_ssl ARGUMENT
@@ -327,6 +324,8 @@ function process_server {
 # Process the -c flag.
 function process_c {
     c_cmd="$1"
+    cmdline2="${cmdline2} -c"
+    test "X$c_cmd" != "X" && cmdline2="${cmdline2} '$c_cmd'"
 }
 
 # function: process_e ARGUMENT
@@ -431,14 +430,17 @@ function process_R {
 # Include the given file or directory in the client's temporary
 # tree to be sent to the server.
 function include_file_or_directory {
-    # Add a symbolic link of the named file or directory to our temporary directory
+    # Add a symbolic link of the named file or directory to our temporary
+    # directory, but only if the file or directory exists.
     local local_name=`generate_client_temp_name "$2"`
+    echo "$local_name"
+    test -e /$local_name || return
+
     local local_dirname=`dirname "$local_name"`
     mkdir -p "$tmpdir_client/$1/$local_dirname" || \
 	fatal "Could not create $tmpdir_client/$1/$local_dirname"
     ln -s "/$local_name" "$tmpdir_client/$1/$local_name" || \
 	fatal "Could not link $tmpdir_client/$1/$local_name to /$local_name"
-    echo "$local_name"
 }
 
 # function: generate_client_temp_name NAME
diff --git a/testsuite/systemtap.server/server.exp b/testsuite/systemtap.server/server.exp
index d2dd0f16..ec561d8e 100644
--- a/testsuite/systemtap.server/server.exp
+++ b/testsuite/systemtap.server/server.exp
@@ -16,11 +16,7 @@ foreach file [lsort [glob -nocomplain $srcdir/$self/*.stp]] {
     # some tests are known to fail.
     switch $test {
         "buildok/perfmon01.stp with server" {setup_kfail 909 *-*-*}
-        "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 }
 }