From a81d1b40351c85129b2202bf504e4daed59813d8 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Wed, 4 Nov 2009 17:08:49 -0500 Subject: [svn-r17832] Bug fix:(sort of) Some systems, like AIX poe, interpret exit(134) the same as if the process has really been interrupted by the abort signal and prints extra messages that confuse test script which is looking for matching output. Solution: Changed it to exit(6) which still has the "appearance" of an abort signal which carries the value of 6 in Unix systems. Tested: LLNL Up both serial and Parallel. --- test/tcheck_version.c | 7 +++++-- test/testcheck_version.sh.in | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/test/tcheck_version.c b/test/tcheck_version.c index d8894b3..91d98ef 100644 --- a/test/tcheck_version.c +++ b/test/tcheck_version.c @@ -96,7 +96,10 @@ parse(int ac, char **av) } /* Handler for SIGABRT - catch the abort signal supposedly from check_version() - * and exit(134). 134 would have been the return code in Unix systems. + * and exit(6). Would have used 134 is the return code in Unix systems + * but some systems (e.g., poe in AIX interprets exit(134) the same as + * if the process has really been interrupted by the abort signal and prints + * extra messages that confuse test script that is looking for matching output. * This handles the abort signal instead letting it interrupt the OS because * some systems may produce extra messages and/or produce core dump. * This tries to eliminate those side effects. @@ -104,7 +107,7 @@ parse(int ac, char **av) void abort_intercept (int UNUSED sig) { - HDexit(134); + HDexit(6); } int diff --git a/test/testcheck_version.sh.in b/test/testcheck_version.sh.in index e2fa44c..6e80654 100644 --- a/test/testcheck_version.sh.in +++ b/test/testcheck_version.sh.in @@ -162,7 +162,7 @@ TESTING() { ;; *) # W/A: Warning, abort and exit non-0. WarnMesg > $expect - expect_code=134 # Signal Abort exit code (128+6) + expect_code=6 # Signal Abort exit code (128+6) ;; esac fi -- cgit v0.12