From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Wed, 12 Nov 2008 06:07:31 +0000 (+0100)
Subject: Testsuite fixes for ksh.
X-Git-Tag: v1.10b~60
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f51165dd1a6ca52d64ba73697e9ba4a24715b0ec;p=platform%2Fupstream%2Fautomake.git

Testsuite fixes for ksh.

* tests/check10.test: Add ':' as last command in subshell, for
zero exit status of the subshell.
* tests/parallel-am.test: Do not let failing 'unset' of
nonexistent variable exit the test.
* tests/parallel-am2.test: Likewise.
* tests/parallel-am3.test: Likewise.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index 8dd1158..0490745 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-11-12  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Testsuite fixes for ksh.
+	* tests/check10.test: Add ':' as last command in subshell, for
+	zero exit status of the subshell.
+	* tests/parallel-am.test: Do not let failing 'unset' of
+	nonexistent variable exit the test.
+	* tests/parallel-am2.test: Likewise.
+	* tests/parallel-am3.test: Likewise.
+
 2008-11-11 Charles Wilson  <libtool@cwilson.fastmail.fm>  (tiny change)
 	   Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
diff --git a/tests/check10.test b/tests/check10.test
index c817dcb..138331c 100755
--- a/tests/check10.test
+++ b/tests/check10.test
@@ -72,6 +72,7 @@ unset TESTS || :
   env TESTS="xpass xpass2" $MAKE -e check
   env TESTS='pass skip xfail' $MAKE -e check
   $MAKE check
+  :
 ) >stdout
 cat stdout
 
diff --git a/tests/parallel-am.test b/tests/parallel-am.test
index 8bd5585..e2101e5 100755
--- a/tests/parallel-am.test
+++ b/tests/parallel-am.test
@@ -81,7 +81,7 @@ $ACLOCAL
 # Further, automake output should be stable.
 
 # Generate expected output using the non-threaded code.
-unset AUTOMAKE_JOBS
+unset AUTOMAKE_JOBS || :
 AUTOMAKE_run 0 --add-missing
 mv stderr expected
 Makefile_ins=`find . -name Makefile.in`
diff --git a/tests/parallel-am2.test b/tests/parallel-am2.test
index b92b79e..9e002ba 100755
--- a/tests/parallel-am2.test
+++ b/tests/parallel-am2.test
@@ -61,7 +61,7 @@ $ACLOCAL
 # Thus we install the auxiliary files in a prior step.
 
 # Generate expected output using non-threaded code.
-unset AUTOMAKE_JOBS
+unset AUTOMAKE_JOBS || :
 rm -f install-sh missing depcomp
 AUTOMAKE_fails --add-missing
 mv stderr expected
diff --git a/tests/parallel-am3.test b/tests/parallel-am3.test
index b3b0aac..11e4706 100755
--- a/tests/parallel-am3.test
+++ b/tests/parallel-am3.test
@@ -57,7 +57,7 @@ mkdir build-aux
 $ACLOCAL
 
 # Generate expected output using the non-threaded code.
-unset AUTOMAKE_JOBS
+unset AUTOMAKE_JOBS || :
 AUTOMAKE_run 0 --add-missing
 mv stderr expected
 mv Makefile.in Makefile.in.exp