From: David Smith <dsmith@redhat.com>
Date: Wed, 26 Mar 2014 21:00:51 +0000 (-0500)
Subject: Updated some expected output in several syscall tests.
X-Git-Tag: release-2.5~126
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=017dc85c3bbfa4adc74270726450e5f785a36f67;p=systemtap.git

Updated some expected output in several syscall tests.

* testsuite/systemtap.syscall/bind.c: Update expected test output.
* testsuite/systemtap.syscall/getitimer.c: Ditto.
* testsuite/systemtap.syscall/getrusage.c: Ditto.
* testsuite/systemtap.syscall/sendfile.c: Ditto.
* testsuite/systemtap.syscall/setitimer.c: Ditto.
* testsuite/systemtap.syscall/wait4.c: Ditto.
---

diff --git a/testsuite/systemtap.syscall/bind.c b/testsuite/systemtap.syscall/bind.c
index 46739cc08..8832726f4 100644
--- a/testsuite/systemtap.syscall/bind.c
+++ b/testsuite/systemtap.syscall/bind.c
@@ -60,7 +60,7 @@ int main()
   //staptest// bind (NNNN, {AF_INET, 0.0.0.0, 0}, 16) = 0
 
   bind(sock_local, (struct sockaddr *)&sun1, sizeof(sun1));
-  //staptest// bind (NNNN, {AF_UNIX, \.}, 110) = -NNNN (EADDRINUSE)
+  //staptest// bind (NNNN, {AF_UNIX, "\."}, 110) = -NNNN (EADDRINUSE)
 
   bind(sock_inet_stream, (struct sockaddr *)&sin3, sizeof(sin3));
   //staptest// bind (NNNN, {AF_INET, 10.255.254.253, 0}, 16) = -NNNN (EADDRNOTAVAIL)
diff --git a/testsuite/systemtap.syscall/getitimer.c b/testsuite/systemtap.syscall/getitimer.c
index de2f29d26..e44ef1a3f 100644
--- a/testsuite/systemtap.syscall/getitimer.c
+++ b/testsuite/systemtap.syscall/getitimer.c
@@ -19,7 +19,11 @@ int main()
     //staptest// getitimer (BAD VALUE: -1, XXXX) = -NNNN (EINVAL)
 
     getitimer(ITIMER_REAL, (struct itimerval *)-1);
+#ifdef __s390__
+    //staptest// getitimer (ITIMER_REAL, 0x[7]?[f]+) = -NNNN (EFAULT)
+#else
     //staptest// getitimer (ITIMER_REAL, 0x[f]+) = -NNNN (EFAULT)
+#endif
 
     return 0;
 }
diff --git a/testsuite/systemtap.syscall/getrusage.c b/testsuite/systemtap.syscall/getrusage.c
index 4a74b558b..701275521 100644
--- a/testsuite/systemtap.syscall/getrusage.c
+++ b/testsuite/systemtap.syscall/getrusage.c
@@ -26,7 +26,11 @@ int main()
     //staptest// getrusage (UNKNOWN VALUE: -2, XXXX) = -NNNN (EINVAL)
 
     getrusage(RUSAGE_SELF, (struct rusage *)-1);
+#ifdef __s390__
+    //staptest// getrusage (RUSAGE_SELF, 0x[7]?[f]+) = -NNNN (EFAULT)
+#else
     //staptest// getrusage (RUSAGE_SELF, 0x[f]+) = -NNNN (EFAULT)
+#endif
 
     return 0;
 }
diff --git a/testsuite/systemtap.syscall/sendfile.c b/testsuite/systemtap.syscall/sendfile.c
index 342741923..f0db444b9 100644
--- a/testsuite/systemtap.syscall/sendfile.c
+++ b/testsuite/systemtap.syscall/sendfile.c
@@ -45,18 +45,20 @@ int main ()
 	//staptest// sendfile (NNNN, -1, XXXX, 22) = -NNNN (EBADF)
 
 	sendfile (write_fd, read_fd, (off_t *)-1, sizeof(buff));
+#ifdef __s390__
+	//staptest// sendfile (NNNN, NNNN, 0x[7]?[f]+, 22) = -NNNN (EFAULT)
+#else
 	//staptest// sendfile (NNNN, NNNN, 0x[f]+, 22) = -NNNN (EFAULT)
+#endif
 
 	sendfile (write_fd, read_fd, &offset, -1);
 	// The 'count' argument is a size_t, which is an unsigned
 	// long, whose size varies by platform. (The return value
 	// varies here as well, so we'll just ignore it.)
-#if ULONG_MAX == 0xffffffffUL
-	//staptest// sendfile (NNNN, NNNN, XXXX, 4294967295)
-#elif ULONG_MAX == 0xffffffffffffffffUL
+#if __WORDSIZE == 64
 	//staptest// sendfile (NNNN, NNNN, XXXX, 18446744073709551615)
 #else
-#error unhandled ULONG_MAX value
+	//staptest// sendfile (NNNN, NNNN, XXXX, 4294967295)
 #endif
 	close (read_fd);
 	close (write_fd);
diff --git a/testsuite/systemtap.syscall/setitimer.c b/testsuite/systemtap.syscall/setitimer.c
index b86321bdb..d17428313 100644
--- a/testsuite/systemtap.syscall/setitimer.c
+++ b/testsuite/systemtap.syscall/setitimer.c
@@ -21,7 +21,11 @@ int main()
     //staptest// setitimer (ITIMER_VIRTUAL, UNKNOWN, XXXX) = -NNNN (EFAULT)
 
     setitimer(ITIMER_PROF, &value, (struct itimerval *)-1);
+#ifdef __s390__
+    //staptest// setitimer (ITIMER_PROF, \[0\.000000,30\.000000\], 0x[7]?[f]+) = -NNNN (EFAULT)
+#else
     //staptest// setitimer (ITIMER_PROF, \[0\.000000,30\.000000\], 0x[f]+) = -NNNN (EFAULT)
+#endif
 
     return 0;
 }
diff --git a/testsuite/systemtap.syscall/wait4.c b/testsuite/systemtap.syscall/wait4.c
index ad797d77c..295f8e38e 100644
--- a/testsuite/systemtap.syscall/wait4.c
+++ b/testsuite/systemtap.syscall/wait4.c
@@ -47,7 +47,11 @@ main()
 	exit(0);
     }
     wait4(child, (int *)-1, 0, NULL);
+#ifdef __s390__
+    //staptest// wait4 (NNNN, 0x[7]?[f]+, 0, 0x0) = -NNNN (EFAULT)
+#else
     //staptest// wait4 (NNNN, 0x[f]+, 0, 0x0) = -NNNN (EFAULT)
+#endif
 
     // Just in case the failing wait4() call above didn't clean up...
     wait4(child, 0, 0, NULL);
@@ -93,7 +97,11 @@ main()
     }
 
     wait4(child, NULL, 0, (struct rusage *)-1);
+#ifdef __s390__
+    //staptest// wait4 (NNNN, 0x0, 0, 0x[7]?[f]+) = -NNNN (EFAULT)
+#else
     //staptest// wait4 (NNNN, 0x0, 0, 0x[f]+) = -NNNN (EFAULT)
+#endif
 
     // Just in case the failing wait4() call above didn't clean up...
     wait4(child, 0, 0, NULL);