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/silent7.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/silent7.sh')
-rwxr-xr-x | t/silent7.sh | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/t/silent7.sh b/t/silent7.sh index 716eadaad..5e5472e12 100755 --- a/t/silent7.sh +++ b/t/silent7.sh @@ -17,7 +17,7 @@ # Check user extensibility of silent-rules mode. # Aslo check that silent rules are disabled by default. -. ./defs || Exit 1 +. ./defs || exit 1 echo AC_OUTPUT >> configure.ac @@ -42,46 +42,46 @@ $AUTOCONF # Silent rules are disabled by default, since we haven't called # "AM_SILENT_RULES([yes])" explicitly. ./configure -$MAKE >stdout || { cat stdout; Exit 1; } +$MAKE >stdout || { cat stdout; exit 1; } cat stdout -grep 'GEN ' stdout && Exit 1 +grep 'GEN ' stdout && exit 1 grep 'cp ' stdout grep 'echo ' stdout $MAKE clean -$MAKE V=1 >stdout || { cat stdout; Exit 1; } +$MAKE V=1 >stdout || { cat stdout; exit 1; } cat stdout -grep 'GEN ' stdout && Exit 1 +grep 'GEN ' stdout && exit 1 grep 'cp ' stdout grep 'echo ' stdout $MAKE clean -$MAKE V=0 >stdout || { cat stdout; Exit 1; } +$MAKE V=0 >stdout || { cat stdout; exit 1; } cat stdout grep 'GEN .*foo' stdout -grep 'cp ' stdout && Exit 1 -grep 'echo ' stdout && Exit 1 +grep 'cp ' stdout && exit 1 +grep 'echo ' stdout && exit 1 $MAKE distclean ./configure --enable-silent-rules -$MAKE >stdout || { cat stdout; Exit 1; } +$MAKE >stdout || { cat stdout; exit 1; } cat stdout grep 'GEN .*foo' stdout -grep 'cp ' stdout && Exit 1 -grep 'echo ' stdout && Exit 1 +grep 'cp ' stdout && exit 1 +grep 'echo ' stdout && exit 1 $MAKE clean -$MAKE V=0 >stdout || { cat stdout; Exit 1; } +$MAKE V=0 >stdout || { cat stdout; exit 1; } cat stdout grep 'GEN .*foo' stdout -grep 'cp ' stdout && Exit 1 -grep 'echo ' stdout && Exit 1 +grep 'cp ' stdout && exit 1 +grep 'echo ' stdout && exit 1 $MAKE clean -$MAKE V=1 >stdout || { cat stdout; Exit 1; } +$MAKE V=1 >stdout || { cat stdout; exit 1; } cat stdout -grep 'GEN ' stdout && Exit 1 +grep 'GEN ' stdout && exit 1 grep 'cp ' stdout grep 'echo ' stdout |