Avoid Solaris sh `set -e' bug in vala4.test.

* tests/vala4.test: New variable $cwd, holding the full path of the
current directory.  Use it instead of `pwd` command substitution,
to avoid Heirloom/Solaris Sh bug with `set -e'.

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

diff --git a/ChangeLog b/ChangeLog
index ca526c80b62e221cc86a324ae727e162563b7ecc..c9709221d6fd99753c00b7d7f2f8ce41776adc19 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-04  Stefano Lattarini  <stefano.lattarini@gmail.com>
+           Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Avoid Solaris sh `set -e' bug in vala4.test.
+       * tests/vala4.test: New variable $cwd, holding the full path of the
+       current directory.  Use it instead of `pwd` command substitution,
+       to avoid Heirloom/Solaris Sh bug with `set -e'.
+
 2009-11-28  Jim Meyering  <meyering@redhat.com>
 
        do not put world-writable directories in distribution tarballs

diff --git a/tests/vala4.test b/tests/vala4.test
index 4301d45a077a74f4d2277d90135d86484908fd7a..7a15ebe2005fa82a77a506a01353bb6bbd1e3fe3 100755 (executable)
--- a/tests/vala4.test
+++ b/tests/vala4.test
@@ -43,19 +43,24 @@ exit 0
 END
 chmod +x valac
 
+cwd=`pwd`
+
+# Use $cwd instead of `pwd` in the && list below to avoid a bug in
+# the way Solaris/Heirloom Sh handles `set -e'.
+
 libtoolize
 $ACLOCAL
 $AUTOMAKE -a
 $AUTOCONF
-./configure "VALAC=`pwd`/valac"
+./configure "VALAC=$cwd/valac"
 
 sed 's/AM_PROG_VALAC.*/AM_PROG_VALAC([9999.9])/' < configure.in >t
 mv -f t configure.in
 $AUTOCONF --force
-./configure "VALAC=`pwd`/valac" && Exit 1
+./configure "VALAC=$cwd/valac" && Exit 1
 
 sed 's/AM_PROG_VALAC.*/AM_PROG_VALAC([1.2.3])/' < configure.in >t
 mv -f t configure.in
 $AUTOCONF --force
-./configure "VALAC=`pwd`/valac"
+./configure "VALAC=$cwd/valac"
 :