From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 16 Nov 2010 19:02:54 +0000 (+0100)
Subject: Fix regression in colon{5,6}.test (failures on AIX 5.3).
X-Git-Tag: v1.11.1b~42^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e1f2a13d9b97f3327e7ad0e98f0cc10b6dd490a;p=thirdparty%2Fautomake.git

Fix regression in colon{5,6}.test (failures on AIX 5.3).

* tests/colon5.test: Also substitute `@SHELL@' with `$SHELL' when
post-processing the generated Makefile.in, to work around a bug
of AIX 5.3 make which doesn't allow setting the `$(SHELL)' macro
on the commend line.  Calls to `$MAKE' adjusted accordingly.
* tests/colon6.test: Likewise.

Regression introduced in commit v1.11-175-gf9fe878 "Modernize,
improve and/or extend tests `colon*.test", and reported by Ralf
Wildenhues.
---

diff --git a/ChangeLog b/ChangeLog
index eff021293..943c1f4de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-16  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	Fix regression in colon{5,6}.test (failures on AIX 5.3).
+	* tests/colon5.test: Also substitute `@SHELL@' with `$SHELL' when
+	post-processing the generated Makefile.in, to work around a bug
+	of AIX 5.3 make which doesn't allow setting the `$(SHELL)' macro
+	on the commend line.  Calls to `$MAKE' adjusted accordingly.
+	* tests/colon6.test: Likewise.
+	Regression introduced in commit v1.11-175-gf9fe878 "Modernize,
+	improve and/or extend tests `colon*.test", and reported by Ralf
+	Wildenhues.
+
 2010-08-08  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
 	Modernize, improve and/or extend tests `colon*.test.
diff --git a/tests/colon5.test b/tests/colon5.test
index c53910e67..9dae9c8e4 100755
--- a/tests/colon5.test
+++ b/tests/colon5.test
@@ -45,7 +45,7 @@ $AUTOMAKE
 grep 'Makefile:Makefile\.in' Makefile.in
 grep '^Makefile:.* \$(srcdir)/Makefile\.dep' Makefile.in
 
-sed '/@SET_MAKE@/d' <Makefile.in >Makefile.sed
+sed -e '/@SET_MAKE@/d' -e "s!@SHELL@!$SHELL!g" <Makefile.in >Makefile.sed
 $MAKE -f Makefile.sed SHELL=$SHELL test
 
 :
diff --git a/tests/colon6.test b/tests/colon6.test
index 4fb738e68..7c620d6d5 100755
--- a/tests/colon6.test
+++ b/tests/colon6.test
@@ -47,7 +47,7 @@ $AUTOMAKE
 $EGREP 'Makefile:.*(demo|version)' demo/Makefile.in && Exit 1
 grep 'version\.good:.*version\.gin' demo/Makefile.in
 
-sed '/@SET_MAKE@/d' <demo/Makefile.in >Makefile.sed
+sed -e '/@SET_MAKE@/d' -e "s!@SHELL@!$SHELL!g" <demo/Makefile.in >Makefile.sed
 $MAKE -f Makefile.sed SHELL=$SHELL test
 
 :