Re: testsuite: fixed spurious failure in vala4.test (w.r.t. Solaris sh)

[Ralf Wildenhues]

I've shortened the patch somewhat and adjusted the log entry somewhat,
hope you don't mind.  I've queued this for maint.

(I would have queued the mode patches for maint as well, but they caused
a conflict there, and I didn't figure porting was that important.)

Thanks again,
Ralf

commit cce60a543d55a27b4a0424c580b58a4fd53ec1be
Author: Stefano Lattarini <address@hidden>
Date:   Fri Dec 4 15:47:23 2009 +0100

    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 <address@hidden>

diff --git a/ChangeLog b/ChangeLog
index ca526c8..c970922 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-04  Stefano Lattarini  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       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  <address@hidden>
 
        do not put world-writable directories in distribution tarballs
diff --git a/tests/vala4.test b/tests/vala4.test
index 4301d45..7a15ebe 100755
--- 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"
 :