am-ft: make the environment available earlier

[platform/upstream/automake.git] / t / preproc-demo.sh

diff --git a/t/preproc-demo.sh b/t/preproc-demo.sh
old mode 100755 (executable)
new mode 100644 (file)
index 4c1b2d9..8d16e92
--- a/t/preproc-demo.sh
+++ b/t/preproc-demo.sh
@@ -142,7 +142,6 @@ END
 cat > lib/tests/gnulib-check.am <<'END'
 check_PROGRAMS += %D%/safe-print-test
 TESTS += $(check_PROGRAMS)
-AM_TESTS_ENVIRONMENT += EXEEXT='$(EXEEXT)'; export EXEEXT;
 END
 
 cat > lib/tests/safe-print-test.c <<'END'
@@ -161,6 +160,8 @@ cat > tests/check.am <<'END'
 TEST_EXTENSIONS = .sh
 SH_LOG_COMPILER = $(SHELL)
 
+AM_TESTS_ENVIRONMENT += EXEEXT='$(EXEEXT)'; export EXEEXT;
+
 handwritten_TESTS = \
   %D%/hello.sh \
   %D%/built.sh
@@ -213,8 +214,7 @@ test -f build-aux/compile
 
 $MAKE
 
-VERBOSE=x $MAKE check >stdout || { cat stdout; exit 1; }
-cat stdout
+run_make -O check VERBOSE=x
 cat tests/built.log
 cat tests/hello.log
 cat tests/goodbye.log