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/vpath.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/vpath.sh')
| -rwxr-xr-x | t/vpath.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/vpath.sh b/t/vpath.sh index 4bfc9be90..dcb08ffb0 100755 --- a/t/vpath.sh +++ b/t/vpath.sh @@ -17,7 +17,7 @@ # Test to make sure VPATH can be overridden. # Report from Anthony Green. -. ./defs || Exit 1 +. ./defs || exit 1 cat > Makefile.am << 'END' VPATH = zardoz @@ -28,6 +28,6 @@ $AUTOMAKE grep VPATH Makefile.in # For debugging. grep '^VPATH = zardoz$' Makefile.in -grep 'VPATH.*@srcdir@' Makefile.in && Exit 1 +grep 'VPATH.*@srcdir@' Makefile.in && exit 1 : |