diff --git a/sim/testsuite/sim/cris/ChangeLog b/sim/testsuite/sim/cris/ChangeLog index f206a4055f..4ea54eb7ba 100644 --- a/sim/testsuite/sim/cris/ChangeLog +++ b/sim/testsuite/sim/cris/ChangeLog @@ -1,3 +1,12 @@ +2012-03-24 Mike Frysinger + + * c/clone5.c: Update output to ignore decoded signal string. + * c/fcntl1.c, c/kill2.c, c/kill3.c, c/mprotect1.c, c/pipe5.c, + c/readlink5.c, c/rtsigprocmask1.c, c/rtsigsuspend1.c, c/sig10.c, + c/sig11.c, c/sig3.c, c/sig4.c, c/sig5.c, c/sig6.c, c/sig7.c, + c/sig8.c, c/sigreturn1.c, c/sigreturn2.c, c/syscall1.c, + c/syscall2.c, c/syscall3.c, c/syscall4.c, c/sysctl2.c: Likewise. + 2012-03-21 Mike Frysinger * asm/addqpc.ms: Update output to ignore decoded signal string. diff --git a/sim/testsuite/sim/cris/c/clone5.c b/sim/testsuite/sim/cris/c/clone5.c index 3444b56ebd..9380a1ea5a 100644 --- a/sim/testsuite/sim/cris/c/clone5.c +++ b/sim/testsuite/sim/cris/c/clone5.c @@ -2,7 +2,7 @@ #notarget: cris*-*-elf #xerror: #output: Unimplemented clone syscall * -#output: program stopped with signal 4.\n +#output: program stopped with signal 4 (*).\n */ #include diff --git a/sim/testsuite/sim/cris/c/fcntl1.c b/sim/testsuite/sim/cris/c/fcntl1.c index 184fd64521..032f6b5019 100644 --- a/sim/testsuite/sim/cris/c/fcntl1.c +++ b/sim/testsuite/sim/cris/c/fcntl1.c @@ -2,7 +2,7 @@ #notarget: cris*-*-elf #xerror: #output: Unimplemented fcntl* -#output: program stopped with signal 4.\n +#output: program stopped with signal 4 (*).\n */ #include #include diff --git a/sim/testsuite/sim/cris/c/kill2.c b/sim/testsuite/sim/cris/c/kill2.c index 183091cf66..6b064e782a 100644 --- a/sim/testsuite/sim/cris/c/kill2.c +++ b/sim/testsuite/sim/cris/c/kill2.c @@ -1,6 +1,6 @@ /* Basic kill functionality test; suicide. #xerror: -#output: program stopped with signal 6.\n +#output: program stopped with signal 6 (*).\n */ #include diff --git a/sim/testsuite/sim/cris/c/kill3.c b/sim/testsuite/sim/cris/c/kill3.c index b70f3d324d..c0e2179901 100644 --- a/sim/testsuite/sim/cris/c/kill3.c +++ b/sim/testsuite/sim/cris/c/kill3.c @@ -1,6 +1,6 @@ /* Basic kill functionality test; suicide. #xerror: -#output: program stopped with signal 6.\n +#output: program stopped with signal 6 (*).\n */ #include diff --git a/sim/testsuite/sim/cris/c/mprotect1.c b/sim/testsuite/sim/cris/c/mprotect1.c index 01d9519da3..8dae50ba6e 100644 --- a/sim/testsuite/sim/cris/c/mprotect1.c +++ b/sim/testsuite/sim/cris/c/mprotect1.c @@ -2,7 +2,7 @@ #notarget: cris*-*-elf #xerror: #output: Unimplemented mprotect call (0x0, 0x2001, 0x4)\n -#output: program stopped with signal 4.\n +#output: program stopped with signal 4 (*).\n */ #include #include diff --git a/sim/testsuite/sim/cris/c/pipe5.c b/sim/testsuite/sim/cris/c/pipe5.c index abf1c9fcd9..2b4d763353 100644 --- a/sim/testsuite/sim/cris/c/pipe5.c +++ b/sim/testsuite/sim/cris/c/pipe5.c @@ -2,7 +2,7 @@ #notarget: cris*-*-elf #xerror: #output: Terminating simulation due to writing pipe * from one single thread\n -#output: program stopped with signal 4.\n +#output: program stopped with signal 4 (*).\n */ #include #include diff --git a/sim/testsuite/sim/cris/c/readlink5.c b/sim/testsuite/sim/cris/c/readlink5.c index 11de348711..80f20dadd8 100644 --- a/sim/testsuite/sim/cris/c/readlink5.c +++ b/sim/testsuite/sim/cris/c/readlink5.c @@ -3,6 +3,6 @@ #dest: ./readlink5.c.x #xerror: #output: Unimplemented readlink syscall (*)\n -#output: program stopped with signal 4.\n +#output: program stopped with signal 4 (*).\n */ #include "readlink2.c" diff --git a/sim/testsuite/sim/cris/c/rtsigprocmask1.c b/sim/testsuite/sim/cris/c/rtsigprocmask1.c index 7cc7c5c5e5..b76c33853a 100644 --- a/sim/testsuite/sim/cris/c/rtsigprocmask1.c +++ b/sim/testsuite/sim/cris/c/rtsigprocmask1.c @@ -3,7 +3,7 @@ #cc: additional_flags=-pthread #xerror: #output: Unimplemented rt_sigprocmask syscall (0x3, 0x0, 0x3dff*\n -#output: program stopped with signal 4.\n +#output: program stopped with signal 4 (*).\n Testing a signal handler corner case. */ diff --git a/sim/testsuite/sim/cris/c/rtsigsuspend1.c b/sim/testsuite/sim/cris/c/rtsigsuspend1.c index 0e00cc17b1..66ca795450 100644 --- a/sim/testsuite/sim/cris/c/rtsigsuspend1.c +++ b/sim/testsuite/sim/cris/c/rtsigsuspend1.c @@ -2,7 +2,7 @@ #notarget: cris*-*-elf #xerror: #output: Unimplemented rt_sigsuspend syscall arguments (0x1, 0x2)\n -#output: program stopped with signal 4.\n +#output: program stopped with signal 4 (*).\n */ #include diff --git a/sim/testsuite/sim/cris/c/sig10.c b/sim/testsuite/sim/cris/c/sig10.c index d9263081c6..ef548327eb 100644 --- a/sim/testsuite/sim/cris/c/sig10.c +++ b/sim/testsuite/sim/cris/c/sig10.c @@ -3,7 +3,7 @@ #cc: additional_flags=-pthread #xerror: #output: Exiting pid 42 due to signal 9\n -#output: program stopped with signal 4.\n +#output: program stopped with signal 4 (*).\n */ #include diff --git a/sim/testsuite/sim/cris/c/sig11.c b/sim/testsuite/sim/cris/c/sig11.c index 1661f9b409..9c8aad7d88 100644 --- a/sim/testsuite/sim/cris/c/sig11.c +++ b/sim/testsuite/sim/cris/c/sig11.c @@ -3,7 +3,7 @@ #cc: additional_flags=-pthread #xerror: #output: Unimplemented signal: 77\n -#output: program stopped with signal 4.\n +#output: program stopped with signal 4 (*).\n */ #include diff --git a/sim/testsuite/sim/cris/c/sig3.c b/sim/testsuite/sim/cris/c/sig3.c index f613729092..91de227fd3 100644 --- a/sim/testsuite/sim/cris/c/sig3.c +++ b/sim/testsuite/sim/cris/c/sig3.c @@ -1,6 +1,6 @@ /* Check that TRT happens at an abort (3) call, single thread. #xerror: -#output: program stopped with signal 6.\n +#output: program stopped with signal 6 (*).\n */ #include diff --git a/sim/testsuite/sim/cris/c/sig4.c b/sim/testsuite/sim/cris/c/sig4.c index 6d7ec0e5cb..57491f80a3 100644 --- a/sim/testsuite/sim/cris/c/sig4.c +++ b/sim/testsuite/sim/cris/c/sig4.c @@ -3,7 +3,7 @@ #cc: additional_flags=-pthread #xerror: #output: Exiting pid 42 due to signal 6\n -#output: program stopped with signal 6.\n +#output: program stopped with signal 6 (*).\n */ #include diff --git a/sim/testsuite/sim/cris/c/sig5.c b/sim/testsuite/sim/cris/c/sig5.c index 674621e172..2748aa52b5 100644 --- a/sim/testsuite/sim/cris/c/sig5.c +++ b/sim/testsuite/sim/cris/c/sig5.c @@ -1,7 +1,7 @@ /* Check that TRT happens for an uncaught non-abort signal, single thread. #xerror: #output: Unimplemented signal: 7\n -#output: program stopped with signal 4.\n +#output: program stopped with signal 4 (*).\n */ #include diff --git a/sim/testsuite/sim/cris/c/sig6.c b/sim/testsuite/sim/cris/c/sig6.c index 3862cf2ee4..a1f572026a 100644 --- a/sim/testsuite/sim/cris/c/sig6.c +++ b/sim/testsuite/sim/cris/c/sig6.c @@ -3,7 +3,7 @@ #cc: additional_flags=-pthread #xerror: #output: Exiting pid 42 due to signal 7\n -#output: program stopped with signal 4.\n +#output: program stopped with signal 4 (*).\n */ #include diff --git a/sim/testsuite/sim/cris/c/sig7.c b/sim/testsuite/sim/cris/c/sig7.c index 0991ff0968..b04f7c8ba4 100644 --- a/sim/testsuite/sim/cris/c/sig7.c +++ b/sim/testsuite/sim/cris/c/sig7.c @@ -2,7 +2,7 @@ #notarget: cris*-*-elf #xerror: #output: Unimplemented rt_sigaction syscall (0x8, 0x3df*\n -#output: program stopped with signal 4.\n +#output: program stopped with signal 4 (*).\n */ #include #include diff --git a/sim/testsuite/sim/cris/c/sig8.c b/sim/testsuite/sim/cris/c/sig8.c index 8a52b21766..889892f7f3 100644 --- a/sim/testsuite/sim/cris/c/sig8.c +++ b/sim/testsuite/sim/cris/c/sig8.c @@ -1,7 +1,7 @@ /* Check that TRT happens for an ignored catchable signal, single thread. #xerror: #output: Unimplemented signal: 14\n -#output: program stopped with signal 4.\n +#output: program stopped with signal 4 (*).\n Sure, it'd probably be better to support signals in single-thread too, but that's on an as-need basis, and I don't have a need for it yet. */ diff --git a/sim/testsuite/sim/cris/c/sigreturn1.c b/sim/testsuite/sim/cris/c/sigreturn1.c index 09989f5ee0..40fc852f36 100644 --- a/sim/testsuite/sim/cris/c/sigreturn1.c +++ b/sim/testsuite/sim/cris/c/sigreturn1.c @@ -2,7 +2,7 @@ #notarget: cris*-*-elf #xerror: #output: Invalid sigreturn syscall: no signal handler active (0x1, 0x2, 0x3, 0x4, 0x5, 0x6)\n -#output: program stopped with signal 4.\n +#output: program stopped with signal 4 (*).\n */ #include diff --git a/sim/testsuite/sim/cris/c/sigreturn2.c b/sim/testsuite/sim/cris/c/sigreturn2.c index d0305cb507..3848b5fc79 100644 --- a/sim/testsuite/sim/cris/c/sigreturn2.c +++ b/sim/testsuite/sim/cris/c/sigreturn2.c @@ -3,7 +3,7 @@ #cc: additional_flags=-pthread #xerror: #output: Invalid sigreturn syscall: no signal handler active (0x1, 0x2, 0x3, 0x4, 0x5, 0x6)\n -#output: program stopped with signal 4.\n +#output: program stopped with signal 4 (*).\n */ #include diff --git a/sim/testsuite/sim/cris/c/syscall1.c b/sim/testsuite/sim/cris/c/syscall1.c index 150f297c3f..84aacb6e09 100644 --- a/sim/testsuite/sim/cris/c/syscall1.c +++ b/sim/testsuite/sim/cris/c/syscall1.c @@ -2,7 +2,7 @@ #notarget: cris*-*-elf #xerror: #output: Unimplemented syscall: 166 (0x1, 0x2, 0x3, 0x4, 0x5, 0x6)\n -#output: program stopped with signal 4.\n +#output: program stopped with signal 4 (*).\n */ #include diff --git a/sim/testsuite/sim/cris/c/syscall2.c b/sim/testsuite/sim/cris/c/syscall2.c index 43462ec22d..b4dbead0b1 100644 --- a/sim/testsuite/sim/cris/c/syscall2.c +++ b/sim/testsuite/sim/cris/c/syscall2.c @@ -2,7 +2,7 @@ #notarget: cris*-*-elf #xerror: #output: Unimplemented syscall: 0 (0x3, 0x2, 0x1, 0x4, 0x6, 0x5)\n -#output: program stopped with signal 4.\n +#output: program stopped with signal 4 (*).\n */ #include diff --git a/sim/testsuite/sim/cris/c/syscall3.c b/sim/testsuite/sim/cris/c/syscall3.c index 9ba96359ef..f4d02eb6cd 100644 --- a/sim/testsuite/sim/cris/c/syscall3.c +++ b/sim/testsuite/sim/cris/c/syscall3.c @@ -3,7 +3,7 @@ #sim: --cris-unknown-syscall=stop #xerror: #output: Unimplemented syscall: 166 (0x1, 0x2, 0x3, 0x4, 0x5, 0x6)\n -#output: program stopped with signal 4.\n +#output: program stopped with signal 4 (*).\n */ #include "syscall1.c" diff --git a/sim/testsuite/sim/cris/c/syscall4.c b/sim/testsuite/sim/cris/c/syscall4.c index 757099fcf9..ba01cfdeb3 100644 --- a/sim/testsuite/sim/cris/c/syscall4.c +++ b/sim/testsuite/sim/cris/c/syscall4.c @@ -3,7 +3,7 @@ #sim: --cris-unknown-syscall=stop #xerror: #output: Unimplemented syscall: 0 (0x3, 0x2, 0x1, 0x4, 0x6, 0x5)\n -#output: program stopped with signal 4.\n +#output: program stopped with signal 4 (*).\n */ #include "syscall2.c" diff --git a/sim/testsuite/sim/cris/c/sysctl2.c b/sim/testsuite/sim/cris/c/sysctl2.c index b6752a8bc8..f27c37c900 100644 --- a/sim/testsuite/sim/cris/c/sysctl2.c +++ b/sim/testsuite/sim/cris/c/sysctl2.c @@ -1,7 +1,7 @@ /* Check error message for invalid sysctl call. #xerror: #output: Unimplemented _sysctl syscall *\n -#output: program stopped with signal 4.\n +#output: program stopped with signal 4 (*).\n #notarget: cris*-*-elf */