am-ft: make the environment available earlier

[platform/upstream/automake.git] / t / tap-realtime.sh

diff --git a/t/tap-realtime.sh b/t/tap-realtime.sh
old mode 100755 (executable)
new mode 100644 (file)
index 51f7bba..e9b2b0c
--- a/t/tap-realtime.sh
+++ b/t/tap-realtime.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
@@ -22,8 +22,7 @@
 # children, and is pretty hacky and complex; is there a better way to
 # accomplish the checks done here?
 
-am_parallel_tests=yes
-. ./defs || Exit 1
+. test-init.sh
 
 cat >expect-check <<'END'
 eval spawn $env(SHELL) -c ":"
@@ -31,7 +30,7 @@ expect eof
 END
 expect -f expect-check || {
     echo "$me: failed to find a working expect program" >&2
-    Exit 77
+    exit 77
 }
 rm -f expect-check
 
@@ -44,9 +43,9 @@ rm -f expect-check
 # out its output progressively and "in sync" with test execution -- it is
 # make that is stowing such output away instead of presenting it to the
 # user as soon as it gets it.
-if using_gmake; then :; else
+if ! using_gmake; then
   case $MAKE in
-    *\ -j*) skip_ "doesn't with non-GNU concurrent make";;
+    *\ -j*) skip_ "doesn't work with non-GNU concurrent make";;
   esac
   # Prevent Sun Distributed Make from trying to run in parallel.
   DMAKE_MODE=serial; export DMAKE_MODE
@@ -54,8 +53,10 @@ fi
 
 cat > Makefile.am << 'END'
 TESTS = all.test
+AM_COLOR_TESTS= no
 END
-. "$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+
+. tap-setup.sh
 
 cat > all.test <<'END'
 #! /bin/sh