From e59475742dc0363828f05a92979d5f6fa9588dee Mon Sep 17 00:00:00 2001
From: wcohen <wcohen>
Date: Tue, 2 Oct 2007 16:59:33 +0000
Subject: [PATCH] 2007-10-02  William Cohen  <wcohen@redhat.com>

	* systemtap.syscall/signal.c:
	* systemtap.syscall/uid16.c: Compilation regardless of defines.
	* systemtap.syscall/test.tcl: Handle UNSUPP tests correctly.
---
 testsuite/ChangeLog                  | 6 ++++++
 testsuite/systemtap.syscall/signal.c | 6 +++---
 testsuite/systemtap.syscall/test.tcl | 2 +-
 testsuite/systemtap.syscall/uid16.c  | 8 ++++----
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index 035e46ede..a9f4488fb 100644
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-02  William Cohen  <wcohen@redhat.com>
+
+	* systemtap.syscall/signal.c:
+	* systemtap.syscall/uid16.c: Compilation regardless of defines.
+	* systemtap.syscall/test.tcl: Handle UNSUPP tests correctly.
+	
 2007-09-28  Wenji Huang <wenji.huang@oracle.com>
 
         * lib/systemtap.exp: New proc get_system_info.
diff --git a/testsuite/systemtap.syscall/signal.c b/testsuite/systemtap.syscall/signal.c
index d28324f5d..e125e4a10 100644
--- a/testsuite/systemtap.syscall/signal.c
+++ b/testsuite/systemtap.syscall/signal.c
@@ -5,14 +5,15 @@
 #include <sys/syscall.h>
 
 #ifdef SYS_signal
-
 static void 
 sig_act_handler(int signo)
 {
 }
+#endif
 
 int main()
 {
+#ifdef SYS_signal
   sigset_t mask;
   struct sigaction sa;
   pid_t pid;
@@ -51,8 +52,7 @@ int main()
   syscall(SYS_tgkill,pid,pid,SIGUSR1);
    tgkill (NNNN, NNNN, SIGUSR1) = 0
   */
+#endif
 
   return 0;
 }
-
-#endif
diff --git a/testsuite/systemtap.syscall/test.tcl b/testsuite/systemtap.syscall/test.tcl
index fe16358db..21db59fdd 100755
--- a/testsuite/systemtap.syscall/test.tcl
+++ b/testsuite/systemtap.syscall/test.tcl
@@ -30,7 +30,7 @@ proc run_one_test {filename flags} {
     global dir current_dir
 
     set testname [file tail [string range $filename 0 end-2]]
-    set result "UNSUPP $testname"
+    set result "UNSUPP"
 
     if {[catch {exec mktemp -td staptestXXXXX} dir]} {
 	puts stderr "Failed to create temporary directory: $dir"
diff --git a/testsuite/systemtap.syscall/uid16.c b/testsuite/systemtap.syscall/uid16.c
index 97e787510..2d7d33491 100644
--- a/testsuite/systemtap.syscall/uid16.c
+++ b/testsuite/systemtap.syscall/uid16.c
@@ -2,8 +2,6 @@
 /* COVERAGE: getresuid16 setgid16 setresgid16 getresgid16 setreuid16 setregid16 */
 /* COVERAGE: setfsuid16 setfsgid16 */
 
-#ifdef __i386__
-
 /* These are all obsolete 16-bit calls that are still there for compatibility. */
 
 #include <sys/types.h>
@@ -13,6 +11,8 @@
 
 int main ()
 {
+#ifdef __i386__
+
 	uid_t uid, ruid, euid, suid;
 	gid_t gid, rgid, egid, sgid;
 
@@ -66,7 +66,7 @@ int main ()
 	syscall(__NR_setfsgid, 5005);
 	// setfsgid (5005) =
 
+#endif /* __i386__ */
+
 	return 0;
 }	
-
-#endif /* __i386__ */
-- 
2.43.5