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/aclocal-acdir.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/aclocal-acdir.sh')
| -rwxr-xr-x | t/aclocal-acdir.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/aclocal-acdir.sh b/t/aclocal-acdir.sh index e5b2bd2c5..ac5de4cac 100755 --- a/t/aclocal-acdir.sh +++ b/t/aclocal-acdir.sh @@ -18,7 +18,7 @@ # check that stuff in the automake acdir takes precedence over stuff in # the system acdir. -. ./defs || Exit 1 +. ./defs || exit 1 mkdir am sys @@ -70,6 +70,6 @@ $ACLOCAL --automake-acdir am --system-acdir sys $AUTOCONF --force $FGREP 'fake--init--automake' configure $FGREP 'am--macro' configure -$FGREP 'my--macro' configure && Exit 1 # Just to be sure. +$FGREP 'my--macro' configure && exit 1 # Just to be sure. : |