tests: avoid spurious failures in Linux -> MinGW cross-compilation mode

* t/ccnoc-deps.sh: Here.
* t/preproc-demo.sh: And here.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

diff --git a/t/ccnoco-deps.sh b/t/ccnoco-deps.sh
index d4931d5..5d9e9b8 100755 (executable)
--- a/t/ccnoco-deps.sh
+++ b/t/ccnoco-deps.sh
@@ -42,7 +42,7 @@ check-deps: all
        grep 'stdio\.h' $(DEPDIR)/foo.Po
        grep 'foobar\.h' $(DEPDIR)/foo.Po
 check-updated: all
        grep 'stdio\.h' $(DEPDIR)/foo.Po
        grep 'foobar\.h' $(DEPDIR)/foo.Po
 check-updated: all

-       is_newest foo foobar.h
+       is_newest foo$(EXEEXT) foobar.h

 END
 
 # We deliberately don't invoke AM_PROG_CC_C_O here.
 END
 
 # We deliberately don't invoke AM_PROG_CC_C_O here.

diff --git a/t/preproc-demo.sh b/t/preproc-demo.sh
index 1f29057..8d16e92 100644 (file)
--- 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)
 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'
 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)
 
 TEST_EXTENSIONS = .sh
 SH_LOG_COMPILER = $(SHELL)
 

+AM_TESTS_ENVIRONMENT += EXEEXT='$(EXEEXT)'; export EXEEXT;
+

 handwritten_TESTS = \
   %D%/hello.sh \
   %D%/built.sh
 handwritten_TESTS = \
   %D%/hello.sh \
   %D%/built.sh