tests: avoid a spurious failure on MSYS

[platform/upstream/automake.git] / t / dejagnu-siteexp-extend.sh

diff --git a/t/dejagnu-siteexp-extend.sh b/t/dejagnu-siteexp-extend.sh
old mode 100755 (executable)
new mode 100644 (file)
index f0f6194..5b32575
--- a/t/dejagnu-siteexp-extend.sh
+++ b/t/dejagnu-siteexp-extend.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2013 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 # automake-generated Makefile.
 
 required=runtest
-. ./defs || Exit 1
+. test-init.sh
 
 write_check_for ()
 {
@@ -78,7 +78,7 @@ set baz "/foo/"
 set qux "/foo/"
 END
 
-$MAKE check && { cat site.exp; Exit 1; }
+$MAKE check && { cat site.exp; exit 1; }
 grep 'PASS: test_foo' tool.sum
 grep 'FAIL: test_bar' tool.sum
 grep 'FAIL: test_baz' tool.sum
@@ -104,7 +104,7 @@ $sleep
 $AUTOMAKE Makefile
 ./config.status Makefile
 
-$MAKE check || { cat site.exp; Exit 1; }
+$MAKE check || { cat site.exp; exit 1; }
 cat site.exp
 cat bar.dir/bar
 $FGREP '/bar/' site.exp
@@ -147,13 +147,13 @@ grep 'zardoz.*/quux/' site.exp
 $MAKE check
 grep 'PASS: test_zardoz' tool.sum
 grep 'zardoz: /zardoz/' tool.log
-grep 'zardoz.*quux' tool.log && Exit 1
+grep 'zardoz.*quux' tool.log && exit 1
 
 # Check that files in $(EXTRA_DEJAGNU_SITE_CONFIG) are not distributed
 # by default.
 $MAKE distdir
 ls -l $distdir
-test ! -r $distdir/bar.dir/bar
-test ! -r $distdir/quux.exp
+test ! -e $distdir/bar.dir/bar
+test ! -e $distdir/quux.exp
 
 :