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/silent-yacc-headers.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/silent-yacc-headers.sh')
-rwxr-xr-x | t/silent-yacc-headers.sh | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/t/silent-yacc-headers.sh b/t/silent-yacc-headers.sh index f2722707a..632404735 100755 --- a/t/silent-yacc-headers.sh +++ b/t/silent-yacc-headers.sh @@ -18,7 +18,7 @@ # involved (i.e., the '-d' option is in *YFLAGS). required='cc yacc' -. ./defs || Exit 1 +. ./defs || exit 1 mkdir sub @@ -60,11 +60,11 @@ $FGREP '$(bar_YFLAGS)' Makefile.in ./configure --enable-silent-rules -$MAKE >stdout || { cat stdout; Exit 1; } +$MAKE >stdout || { cat stdout; exit 1; } cat stdout -$EGREP ' (-c|-d|-o)' stdout && Exit 1 -$EGREP '(mv|ylwrap) ' stdout && Exit 1 +$EGREP ' (-c|-d|-o)' stdout && exit 1 +$EGREP '(mv|ylwrap) ' stdout && exit 1 grep 'YACC *parse\.c' stdout grep 'updating *parse\.h' stdout @@ -78,11 +78,11 @@ grep 'CCLD *bar' stdout # Check recovering from header removal. rm -f parse.h bar-parse.h -$MAKE parse.h bar-parse.h >stdout || { cat stdout; Exit 1; } +$MAKE parse.h bar-parse.h >stdout || { cat stdout; exit 1; } cat stdout -$EGREP ' (-c|-d|-o)' stdout && Exit 1 -$EGREP '(mv|ylwrap) ' stdout && Exit 1 +$EGREP ' (-c|-d|-o)' stdout && exit 1 +$EGREP '(mv|ylwrap) ' stdout && exit 1 grep 'YACC *parse\.c' stdout grep 'updating *parse\.h' stdout @@ -94,11 +94,11 @@ grep 'updating *bar-parse\.h' stdout # different set of rules. $MAKE clean -$MAKE >stdout || { cat stdout; Exit 1; } +$MAKE >stdout || { cat stdout; exit 1; } cat stdout -$EGREP ' (-c|-d|-o)' stdout && Exit 1 -$EGREP '(mv|ylwrap) ' stdout && Exit 1 +$EGREP ' (-c|-d|-o)' stdout && exit 1 +$EGREP '(mv|ylwrap) ' stdout && exit 1 # Don't look for "YACC *.c" and "updating *.h", as yacc shouldn't # have been re-run. @@ -109,11 +109,11 @@ grep 'CCLD *bar' stdout # Check recovering from header removal. rm -f parse.h bar-parse.h -$MAKE parse.h bar-parse.h >stdout || { cat stdout; Exit 1; } +$MAKE parse.h bar-parse.h >stdout || { cat stdout; exit 1; } cat stdout -$EGREP ' (-c|-d|-o)' stdout && Exit 1 -$EGREP '(mv|ylwrap) ' stdout && Exit 1 +$EGREP ' (-c|-d|-o)' stdout && exit 1 +$EGREP '(mv|ylwrap) ' stdout && exit 1 grep 'YACC *parse\.c' stdout grep 'updating *parse\.h' stdout @@ -125,7 +125,7 @@ $MAKE maintainer-clean ./configure --enable-silent-rules -$MAKE V=1 >stdout || { cat stdout; Exit 1; } +$MAKE V=1 >stdout || { cat stdout; exit 1; } cat stdout grep ' -c ' stdout @@ -133,40 +133,40 @@ grep ' -o ' stdout grep ' -d ' stdout grep 'ylwrap ' stdout -$EGREP '(YACC|CC|CCLD) ' stdout && Exit 1 +$EGREP '(YACC|CC|CCLD) ' stdout && exit 1 # Check recovering from header removal. rm -f parse.h bar-parse.h -$MAKE V=1 parse.h bar-parse.h >stdout || { cat stdout; Exit 1; } +$MAKE V=1 parse.h bar-parse.h >stdout || { cat stdout; exit 1; } cat stdout grep ' -d ' stdout grep 'ylwrap ' stdout -grep 'YACC' stdout && Exit 1 +grep 'YACC' stdout && exit 1 # Cleaning and then rebuilding with the same V flag (and without # removing the generated sources in between) shouldn't trigger a # different set of rules. $MAKE clean -$MAKE V=1 >stdout || { cat stdout; Exit 1; } +$MAKE V=1 >stdout || { cat stdout; exit 1; } cat stdout # Don't look for ylwrap, as probably lex hasn't been re-run. grep ' -c ' stdout grep ' -o ' stdout -$EGREP '(YACC|CC|CCLD) ' stdout && Exit 1 +$EGREP '(YACC|CC|CCLD) ' stdout && exit 1 # Check recovering from header removal. rm -f parse.h bar-parse.h -$MAKE V=1 parse.h bar-parse.h >stdout || { cat stdout; Exit 1; } +$MAKE V=1 parse.h bar-parse.h >stdout || { cat stdout; exit 1; } cat stdout grep ' -d ' stdout grep 'ylwrap ' stdout -grep 'YACC' stdout && Exit 1 +grep 'YACC' stdout && exit 1 : |