From cce60a543d55a27b4a0424c580b58a4fd53ec1be Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Fri, 4 Dec 2009 15:47:23 +0100 Subject: [PATCH] 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 --- ChangeLog | 8 ++++++++ tests/vala4.test | 11 ++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca526c80b..c9709221d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-12-04 Stefano Lattarini + Ralf Wildenhues + + 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 do not put world-writable directories in distribution tarballs diff --git a/tests/vala4.test b/tests/vala4.test index 4301d45a0..7a15ebe20 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" : -- 2.11.4.GIT