diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-28 15:57:28 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-28 16:28:16 +0200 |
| commit | 7721f22a2c0f5b286d04427d011351602341de02 (patch) | |
| tree | b55f3e46fa9d8ef16856034337317f6b40e34d20 /t/lex-line.sh | |
| parent | 8eda774e3d2311513a35c49d7cad5e05c5fd9e03 (diff) | |
| parent | b21d68690612214d8edd810acf11880c3c0ad586 (diff) | |
| download | automake-7721f22a2c0f5b286d04427d011351602341de02.tar.gz | |
Merge branch 'master' into ng/master
* master:
cosmetics: remove trailing whitespace in some files
coverage: enhance tests in 'missing' script a little
coverage: tests AM_MISSING_PROG usage
docs: document AM_MISSING_PROG
tests: fix a spurious failure with Solaris make
tests: simpler workaround for shells losing the exit status in exit trap
tests: avoid several spurious failures on Solaris
tests: avoid a spurious failure on NetBSD
+ 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/lex-line.sh')
| -rwxr-xr-x | t/lex-line.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/t/lex-line.sh b/t/lex-line.sh index 3db979f30..fc7ce17ec 100755 --- a/t/lex-line.sh +++ b/t/lex-line.sh @@ -20,7 +20,7 @@ # See also sister test 'yacc-line.test'. required='cc lex' -. ./defs || Exit 1 +. ./defs || exit 1 cat >> configure.ac << 'END' AC_PROG_CC @@ -86,15 +86,15 @@ for vpath in : false; do ls -l . dir $EGREP 'line|\.l' $c_outputs - grep '#.*line.*build.*\.l' $c_outputs && Exit 1 + grep '#.*line.*build.*\.l' $c_outputs && exit 1 # Adjusted "#line" should not contain reference to the absolute # srcdir. - $EGREP '#.*line *"?/.*\.l' $c_outputs && Exit 1 + $EGREP '#.*line *"?/.*\.l' $c_outputs && exit 1 # Adjusted "#line" should not contain reference to the default # output file names, e.g., 'lex.yy.c'. - grep '#.*line.*lex\.yy' $c_outputs && Exit 1 + grep '#.*line.*lex\.yy' $c_outputs && exit 1 # Look out for a silly regression. - grep "#.*\.l.*\.l" $c_outputs && Exit 1 + grep "#.*\.l.*\.l" $c_outputs && exit 1 if $vpath; then grep '#.*line.*"\.\./zardoz\.l"' zardoz.c grep '#.*line.*"\.\./dir/quux\.l"' dir/bar-quux.c |