ps abort causes problems in testsuite

Under certain circumstances, using abort() when either make check
or make distcheck puts ps into an infinite loop around the
function catastrophic_failure() in ps and the C library raise
and abort functions.

Using exit removes this problem and does almost the same thing.

diff --git a/ps/global.c b/ps/global.c
index 5bddb8c8d6f1587ff177726b5f5c36dab1d1e04b..11f058e5b6907dabb53ab29ca1c252d44ba54930 100644 (file)
--- a/ps/global.c
+++ b/ps/global.c
@@ -515,5 +515,5 @@ catastrophic_failure(const char *filename,
                     const char *message)
 {
   error_at_line(0, 0, filename, linenum, message);
-  abort();
+  exit(EXIT_FAILURE);
 }

diff --git a/testsuite/config/unix.exp b/testsuite/config/unix.exp
index 5331b0df3a91ecf821ab36370520c40680e3403e..6b95655f7615afe86c0c354362bfbbb033546ee2 100644 (file)
--- a/testsuite/config/unix.exp
+++ b/testsuite/config/unix.exp
@@ -40,6 +40,7 @@ proc expect_pass { testname reg } {
     expect {
         -re "$reg" { pass "$testname" }
         default { fail "$testname" }
+               timeout { fail "$testname" }
     }
 }