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/objc-flags.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/objc-flags.sh')
| -rwxr-xr-x | t/objc-flags.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/objc-flags.sh b/t/objc-flags.sh index 25f805b70..2f65d467c 100755 --- a/t/objc-flags.sh +++ b/t/objc-flags.sh @@ -16,7 +16,7 @@ # Test Objective C compilation flags. -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_PROG_OBJC @@ -52,9 +52,9 @@ $AUTOCONF $AUTOMAKE -a $FGREP OBJCFLAGS Makefile.in # For debugging. -grep '\$(OBJCFLAGS).*\$(AM_OBJCFLAGS)' Makefile.in && Exit 1 -grep '\$(OBJCFLAGS).*\$(foo.*_OBJCFLAGS)' Makefile.in && Exit 1 -grep '\$(foo.*_OBJCFLAGS).*\$(AM_OBJCFLAGS)' Makefile.in && Exit 1 +grep '\$(OBJCFLAGS).*\$(AM_OBJCFLAGS)' Makefile.in && exit 1 +grep '\$(OBJCFLAGS).*\$(foo.*_OBJCFLAGS)' Makefile.in && exit 1 +grep '\$(foo.*_OBJCFLAGS).*\$(AM_OBJCFLAGS)' Makefile.in && exit 1 ./configure OBJCFLAGS=-UERROR $MAKE |