i#58 MacOS: port test suite, part 3

Fixes the output from the signal tests to be cross-platform by not printing the signal numbers. Review-URL: https://codereview.appspot.com/274740043
DynamoRIO · Oct 16, 2015 · 5248c8d · 5248c8d
1 parent 72f0bbf
commit 5248c8d
Show file tree

Hide file tree

Showing 26 changed files with 60 additions and 60 deletions.
diff --git a/suite/tests/linux/signal-base.h b/suite/tests/linux/signal-base.h
@@ -99,7 +99,7 @@ signal_handler(int sig, siginfo_t *siginfo, ucontext_t *ucxt)
 # if USE_TIMER
     if (sig != SIGVTALRM)
 # endif
-        print("signal_handler: sig=%d\n", sig);
+        print("in signal handler\n");
 #endif
 
     switch (sig) {
@@ -251,7 +251,7 @@ int main(int argc, char *argv[])
 #else
     /* Match same output */
     print("Sending SIGRTMAX\n");
-    print("signal_handler: sig=64\n");
+    print("in signal handler\n");
     print("Got SIGRTMAX\n");
 #endif
 

diff --git a/suite/tests/linux/signal0000.expect b/suite/tests/linux/signal0000.expect
@@ -1,11 +1,11 @@
 Sending SIGUSR2
 Sending SIGUSR1
-signal_handler: sig=10
+in signal handler
 Got SIGUSR1
 Sending SIGRTMAX
-signal_handler: sig=64
+in signal handler
 Got SIGRTMAX
 Generating SIGSEGV
-signal_handler: sig=11
+in signal handler
 Got SIGSEGV
 250006.749760
diff --git a/suite/tests/linux/signal0001.expect b/suite/tests/linux/signal0001.expect
@@ -1,12 +1,12 @@
 Sending SIGUSR2
 Sending SIGUSR1
-signal_handler: sig=10
+in signal handler
 Got SIGUSR1
 Sending SIGRTMAX
-signal_handler: sig=64
+in signal handler
 Got SIGRTMAX
 Generating SIGSEGV
-signal_handler: sig=11
+in signal handler
 Got SIGSEGV
 1750007.722714
 Got some timer hits!
diff --git a/suite/tests/linux/signal0010.expect b/suite/tests/linux/signal0010.expect
@@ -1,11 +1,11 @@
 Sending SIGUSR2
 Sending SIGUSR1
-signal_handler: sig=10
+in signal handler
 Got SIGUSR1
 Sending SIGRTMAX
-signal_handler: sig=64
+in signal handler
 Got SIGRTMAX
 Generating SIGSEGV
-signal_handler: sig=11
+in signal handler
 Got SIGSEGV
 250006.749760
diff --git a/suite/tests/linux/signal0011.expect b/suite/tests/linux/signal0011.expect
@@ -1,12 +1,12 @@
 Sending SIGUSR2
 Sending SIGUSR1
-signal_handler: sig=10
+in signal handler
 Got SIGUSR1
 Sending SIGRTMAX
-signal_handler: sig=64
+in signal handler
 Got SIGRTMAX
 Generating SIGSEGV
-signal_handler: sig=11
+in signal handler
 Got SIGSEGV
 1750007.722714
 Got some timer hits!
diff --git a/suite/tests/linux/signal0100.expect b/suite/tests/linux/signal0100.expect
@@ -1,11 +1,11 @@
 Sending SIGUSR2
 Sending SIGUSR1
-signal_handler: sig=10
+in signal handler
 Got SIGUSR1
 Sending SIGRTMAX
-signal_handler: sig=64
+in signal handler
 Got SIGRTMAX
 Generating SIGSEGV
-signal_handler: sig=11
+in signal handler
 Got SIGSEGV
 250006.749760
diff --git a/suite/tests/linux/signal0101.expect b/suite/tests/linux/signal0101.expect
@@ -1,12 +1,12 @@
 Sending SIGUSR2
 Sending SIGUSR1
-signal_handler: sig=10
+in signal handler
 Got SIGUSR1
 Sending SIGRTMAX
-signal_handler: sig=64
+in signal handler
 Got SIGRTMAX
 Generating SIGSEGV
-signal_handler: sig=11
+in signal handler
 Got SIGSEGV
 1750007.722714
 Got some timer hits!
diff --git a/suite/tests/linux/signal0110.expect b/suite/tests/linux/signal0110.expect
@@ -1,11 +1,11 @@
 Sending SIGUSR2
 Sending SIGUSR1
-signal_handler: sig=10
+in signal handler
 Got SIGUSR1
 Sending SIGRTMAX
-signal_handler: sig=64
+in signal handler
 Got SIGRTMAX
 Generating SIGSEGV
-signal_handler: sig=11
+in signal handler
 Got SIGSEGV
 250006.749760
diff --git a/suite/tests/linux/signal0111.expect b/suite/tests/linux/signal0111.expect
@@ -1,12 +1,12 @@
 Sending SIGUSR2
 Sending SIGUSR1
-signal_handler: sig=10
+in signal handler
 Got SIGUSR1
 Sending SIGRTMAX
-signal_handler: sig=64
+in signal handler
 Got SIGRTMAX
 Generating SIGSEGV
-signal_handler: sig=11
+in signal handler
 Got SIGSEGV
 1750007.722714
 Got some timer hits!
diff --git a/suite/tests/linux/signal1000.expect b/suite/tests/linux/signal1000.expect
@@ -1,11 +1,11 @@
 Sending SIGUSR2
 Sending SIGUSR1
-signal_handler: sig=10
+in signal handler
 Got SIGUSR1
 Sending SIGRTMAX
-signal_handler: sig=64
+in signal handler
 Got SIGRTMAX
 Generating SIGSEGV
-signal_handler: sig=11
+in signal handler
 Got SIGSEGV
 250006.902505
diff --git a/suite/tests/linux/signal1001.expect b/suite/tests/linux/signal1001.expect
@@ -1,12 +1,12 @@
 Sending SIGUSR2
 Sending SIGUSR1
-signal_handler: sig=10
+in signal handler
 Got SIGUSR1
 Sending SIGRTMAX
-signal_handler: sig=64
+in signal handler
 Got SIGRTMAX
 Generating SIGSEGV
-signal_handler: sig=11
+in signal handler
 Got SIGSEGV
 1750007.875459
 Got some timer hits!
diff --git a/suite/tests/linux/signal1010.expect b/suite/tests/linux/signal1010.expect
@@ -1,11 +1,11 @@
 Sending SIGUSR2
 Sending SIGUSR1
-signal_handler: sig=10
+in signal handler
 Got SIGUSR1
 Sending SIGRTMAX
-signal_handler: sig=64
+in signal handler
 Got SIGRTMAX
 Generating SIGSEGV
-signal_handler: sig=11
+in signal handler
 Got SIGSEGV
 250006.902505
diff --git a/suite/tests/linux/signal1011.expect b/suite/tests/linux/signal1011.expect
@@ -1,12 +1,12 @@
 Sending SIGUSR2
 Sending SIGUSR1
-signal_handler: sig=10
+in signal handler
 Got SIGUSR1
 Sending SIGRTMAX
-signal_handler: sig=64
+in signal handler
 Got SIGRTMAX
 Generating SIGSEGV
-signal_handler: sig=11
+in signal handler
 Got SIGSEGV
 1750007.875459
 Got some timer hits!
diff --git a/suite/tests/linux/signal1100.expect b/suite/tests/linux/signal1100.expect
@@ -1,11 +1,11 @@
 Sending SIGUSR2
 Sending SIGUSR1
-signal_handler: sig=10
+in signal handler
 Got SIGUSR1
 Sending SIGRTMAX
-signal_handler: sig=64
+in signal handler
 Got SIGRTMAX
 Generating SIGSEGV
-signal_handler: sig=11
+in signal handler
 Got SIGSEGV
 250006.902505
diff --git a/suite/tests/linux/signal1101.expect b/suite/tests/linux/signal1101.expect
@@ -1,12 +1,12 @@
 Sending SIGUSR2
 Sending SIGUSR1
-signal_handler: sig=10
+in signal handler
 Got SIGUSR1
 Sending SIGRTMAX
-signal_handler: sig=64
+in signal handler
 Got SIGRTMAX
 Generating SIGSEGV
-signal_handler: sig=11
+in signal handler
 Got SIGSEGV
 1750007.875459
 Got some timer hits!
diff --git a/suite/tests/linux/signal1110.expect b/suite/tests/linux/signal1110.expect
@@ -1,11 +1,11 @@
 Sending SIGUSR2
 Sending SIGUSR1
-signal_handler: sig=10
+in signal handler
 Got SIGUSR1
 Sending SIGRTMAX
-signal_handler: sig=64
+in signal handler
 Got SIGRTMAX
 Generating SIGSEGV
-signal_handler: sig=11
+in signal handler
 Got SIGSEGV
 250006.902505
diff --git a/suite/tests/linux/signal1111.expect b/suite/tests/linux/signal1111.expect
@@ -1,12 +1,12 @@
 Sending SIGUSR2
 Sending SIGUSR1
-signal_handler: sig=10
+in signal handler
 Got SIGUSR1
 Sending SIGRTMAX
-signal_handler: sig=64
+in signal handler
 Got SIGRTMAX
 Generating SIGSEGV
-signal_handler: sig=11
+in signal handler
 Got SIGSEGV
 1750007.875459
 Got some timer hits!
diff --git a/suite/tests/linux/sigplain-base.h b/suite/tests/linux/sigplain-base.h
@@ -1,5 +1,5 @@
 /* **********************************************************
- * Copyright (c) 2012-2014 Google, Inc.  All rights reserved.
+ * Copyright (c) 2012-2015 Google, Inc.  All rights reserved.
  * Copyright (c) 2003-2010 VMware, Inc.  All rights reserved.
  * **********************************************************/
 
@@ -90,7 +90,7 @@ signal_handler(int sig)
         timer_hits++;
     else
 #endif
-        print("signal_handler: sig=%d\n", sig);
+        print("in signal handler\n");
 }
 
 /* set up signal_handler as the handler for signal "sig" */

diff --git a/suite/tests/linux/sigplain000.expect b/suite/tests/linux/sigplain000.expect
@@ -1,4 +1,4 @@
 Sending SIGUSR2
 Sending SIGUSR1
-signal_handler: sig=10
+in signal handler
 250006.749760
diff --git a/suite/tests/linux/sigplain001.expect b/suite/tests/linux/sigplain001.expect
@@ -1,5 +1,5 @@
 Sending SIGUSR2
 Sending SIGUSR1
-signal_handler: sig=10
+in signal handler
 1750007.722714
 Got some timer hits!
diff --git a/suite/tests/linux/sigplain010.expect b/suite/tests/linux/sigplain010.expect
@@ -1,4 +1,4 @@
 Sending SIGUSR2
 Sending SIGUSR1
-signal_handler: sig=10
+in signal handler
 250006.749760
diff --git a/suite/tests/linux/sigplain011.expect b/suite/tests/linux/sigplain011.expect
@@ -1,5 +1,5 @@
 Sending SIGUSR2
 Sending SIGUSR1
-signal_handler: sig=10
+in signal handler
 1750007.722714
 Got some timer hits!
diff --git a/suite/tests/linux/sigplain100.expect b/suite/tests/linux/sigplain100.expect
@@ -1,4 +1,4 @@
 Sending SIGUSR2
 Sending SIGUSR1
-signal_handler: sig=10
+in signal handler
 250006.749760
diff --git a/suite/tests/linux/sigplain101.expect b/suite/tests/linux/sigplain101.expect
@@ -1,5 +1,5 @@
 Sending SIGUSR2
 Sending SIGUSR1
-signal_handler: sig=10
+in signal handler
 1750007.722714
 Got some timer hits!
diff --git a/suite/tests/linux/sigplain110.expect b/suite/tests/linux/sigplain110.expect
@@ -1,4 +1,4 @@
 Sending SIGUSR2
 Sending SIGUSR1
-signal_handler: sig=10
+in signal handler
 250006.749760
diff --git a/suite/tests/linux/sigplain111.expect b/suite/tests/linux/sigplain111.expect
@@ -1,5 +1,5 @@
 Sending SIGUSR2
 Sending SIGUSR1
-signal_handler: sig=10
+in signal handler
 1750007.722714
 Got some timer hits!