diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-28 13:27:49 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-28 13:37:53 +0200 |
| commit | b21d68690612214d8edd810acf11880c3c0ad586 (patch) | |
| tree | 7506c8901d7d16c4a5603a11e567b9e6315c9e9d /t/confsub.sh | |
| parent | da9ad6fafeaf5dfa710a1a2b4176d1a049fddf13 (diff) | |
| parent | d25fac43a7c239fe8f56b2ce1b87ef3e3d4d7ef0 (diff) | |
| download | automake-b21d68690612214d8edd810acf11880c3c0ad586.tar.gz | |
Merge branch 'maint'
* maint:
tests: simpler workaround for shells losing the exit status in exit trap
+ Extra non-trivial edits:
* Several tests: Adjusted to use 'exit' rather than 'Exit'.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/confsub.sh')
| -rwxr-xr-x | t/confsub.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/confsub.sh b/t/confsub.sh index db9f80e51..de21d51e1 100755 --- a/t/confsub.sh +++ b/t/confsub.sh @@ -17,7 +17,7 @@ # Test to make sure config.h can be in subdir. # Also, make sure config.h is properly rebuilt. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_CONFIG_FILES([subdir/Makefile]) @@ -43,7 +43,7 @@ $AUTOMAKE # # cd $(top_builddir) && $(SHELL) ./config.status subdir/config.h ($FGREP 'subdir/config.h' subdir/Makefile.in | - $FGREP -v 'cd $(top_builddir)') && Exit 1 + $FGREP -v 'cd $(top_builddir)') && exit 1 $AUTOCONF ./configure |