Avoid dependency on exit code from false(1) in dejagnu auxiliary launcher

2 files changed, 15 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 51b8a3e..cb7d0ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2021-04-15  Jacob Bachmeyer  <jcb@gnu.org>
+
+	PR47382
+
+	* dejagnu: Avoid using $? for an exit code; it is convenient until
+	the tests fail because the script is run on Solaris where false
+	returns 255 instead of 1 and the test harness expects exit code 1.
+
 2021-04-14  Jacob Bachmeyer  <jcb@gnu.org>
 
 	PR47382
diff --git a/dejagnu b/dejagnu
index 9f6ae4b..ece4e09 100755
--- a/dejagnu
+++ b/dejagnu
@@ -426,13 +426,13 @@ fi
 if test -z "$command" ; then
     if test -n "$override_ext" ; then
 	case $selected_ext in
-	    awk)	$have_awk;	exit $? ;;
-	    bash)	$have_bash;	exit $? ;;
-	    exp)	$have_expect;	exit $? ;;
-	    gawk)	$have_gawk;	exit $? ;;
-	    tcl)	$have_tcl;	exit $? ;;
-	    sh)		$have_sh;	exit $? ;;
-	    *)				exit  2 ;;
+	    awk)    if $have_awk;	then exit 0; else exit 1; fi ;;
+	    bash)   if $have_bash;	then exit 0; else exit 1; fi ;;
+	    exp)    if $have_expect;	then exit 0; else exit 1; fi ;;
+	    gawk)   if $have_gawk;	then exit 0; else exit 1; fi ;;
+	    tcl)    if $have_tcl;	then exit 0; else exit 1; fi ;;
+	    sh)	    if $have_sh;	then exit 0; else exit 1; fi ;;
+	    *)	    exit 2 ;;
 	esac
     else
 	echo ERROR: no command given