diff --git a/tests/test-resume-sig.c b/tests/test-resume-sig.c
index d5da30aa..7d7afab0 100644
--- a/tests/test-resume-sig.c
+++ b/tests/test-resume-sig.c
@@ -1,26 +1,62 @@
+/* libunwind - a platform-independent unwind library
+   Copyright (C) 2003 Hewlett-Packard Co
+	Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
+
 /*  Verify that unw_resume() restores the signal mask at proper time.  */
 
+#define UNW_LOCAL_ONLY
+
 #include <libunwind.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
-#define panic(args...)				\
-	{ fprintf (stderr, args); exit (-1); }
+#define panic(args...)						\
+	do { fprintf (stderr, args); ++nerrors; } while (0)
 
+int verbose;
+int nerrors;
 int got_usr1, got_usr2;
 char *sigusr1_sp;
 
 void
 handler (int sig)
 {
+  unw_word_t ip;
   sigset_t mask;
   unw_context_t uc;
   unw_cursor_t c;
-  unw_word_t ip;
   char foo;
 
+#if UNW_TARGET_IA64
+  void *bsp = __builtin_ia64_bsp ();
+  if (verbose)
+    printf ("bsp = %p\n", bsp);
+#endif
+
+  if (verbose)
+    printf ("got signal %d\n", sig);
+
   if (sig == SIGUSR1)
     {
       ++got_usr1;
@@ -39,25 +75,43 @@ handler (int sig)
       unw_step(&c);		/* step to signal trampoline */
       unw_step(&c);		/* step to signaller frame (main ()) */
       unw_get_reg(&c, UNW_REG_IP, &ip);
-      printf ("resuming at 0x%lx\n", ip);
+      if (verbose)
+	printf ("resuming at 0x%lx, with SIGUSR2 pending\n", ip);
       unw_resume(&c);
     }
   else if (sig == SIGUSR2)
     {
       ++got_usr2;
       if (got_usr1)
-	if (sigusr1_sp != &foo)
-	  panic ("Stack pointer changed from %p to %p between signals\n",
-		 sigusr1_sp, &foo);
+	{
+	  if (sigusr1_sp != &foo)
+	    panic ("Stack pointer changed from %p to %p between signals\n",
+		   sigusr1_sp, &foo);
+	  else if (verbose)
+	    printf ("OK: stack still at %p\n", &foo);
+	}
       signal (SIGUSR2, SIG_IGN);
-    } else
-      panic ("Got unexpected signal %d\n", sig);
+    }
+  else
+    panic ("Got unexpected signal %d\n", sig);
 }
 
 int
 main (int argc, char **argv)
 {
+  if (argc > 1)
+    verbose = 1;
+
   signal (SIGUSR1, handler);
+
+  if (verbose)
+    printf ("sending SIGUSR1\n");
   kill (getpid (), SIGUSR1);
+
+  if (nerrors)
+    fprintf (stderr, "FAILURE: detected %d errors\n", nerrors);
+
+  if (verbose)
+    printf ("SUCCESS\n");
   return 0;
 }