tests: avoid a spurious failure on MSYS

[platform/upstream/automake.git] / t / am-tests-environment.sh

diff --git a/t/am-tests-environment.sh b/t/am-tests-environment.sh
old mode 100755 (executable)
new mode 100644 (file)
index f2931e6..9c387d9
--- a/t/am-tests-environment.sh
+++ b/t/am-tests-environment.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
@@ -17,7 +17,7 @@
 # parallel-tests: check AM_TESTS_ENVIRONMENT support, and its
 # interactions with TESTS_ENVIRONMENT.
 
-. ./defs || Exit 1
+. test-init.sh
 
 cat >> configure.ac << 'END'
 AC_PROG_MKDIR_P
@@ -74,16 +74,16 @@ $AUTOMAKE -a
 
 ./configure
 
-TESTS_ENVIRONMENT='BAR=1' $MAKE check || { debug_info; Exit 1; }
+TESTS_ENVIRONMENT='BAR=1' $MAKE check || { debug_info; exit 1; }
 minicheck
 miniclean
 
-TESTS_ENVIRONMENT='BAR=2' $MAKE check && { debug_info; Exit 1; }
+TESTS_ENVIRONMENT='BAR=2' $MAKE check && { debug_info; exit 1; }
 minicheck
 miniclean
 
 echo 'BAR=1 && export BAR' > test-env.sh
-$MAKE check || { debug_info; Exit 1; }
+$MAKE check || { debug_info; exit 1; }
 minicheck
 $MAKE distcheck