tests: avoid few lingering $MAKE redirections

These were present in the 'maint' branch, but not in the 'micro' branch.
Their occurrences has been found by the 'sc_tests_no_run_make_redirect'
maintainer check.

* t/fort2.sh: Adjust.
* t/preproc-demo.sh: Likewise.

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

diff --git a/t/fort2.sh b/t/fort2.sh
index d6144529624898154746ccb074340a2c90e8a0e7..c2c0f035969cf6b3bb58f1a2f7a8c730c3ba0b7b 100644 (file)
--- a/t/fort2.sh
+++ b/t/fort2.sh
@@ -66,10 +66,8 @@ $AUTOCONF
 touch hello.f90 foo.f95 sub/bar.f95 hi.f03 sub/howdy.f03 greets.f08 \
       sub/bonjour.f08 bye.f95 sub/baz.f90
 
-$MAKE -n \
-  FCFLAGS_f90=--@90 FCFLAGS_f95=--@95 FCFLAGS_f03=--@03 FCFLAGS_f08=--@08 \
-  > stdout || { cat stdout; exit 1; }
-cat stdout
+run_make -O -- -n \
+  FCFLAGS_f90=--@90 FCFLAGS_f95=--@95 FCFLAGS_f03=--@03 FCFLAGS_f08=--@08
 # To make it easier to have  stricter grepping below.
 sed -e 's/[    ][      ]*/  /g' -e 's/^/ /' -e 's/$/ /' stdout > out
 cat out

diff --git a/t/preproc-demo.sh b/t/preproc-demo.sh
index 4c1b2d9dd032bf0a780fcb9ea02c76f3c5fe37d3..1f29057b522fe813103081edb67183ff20a2be1b 100644 (file)
--- a/t/preproc-demo.sh
+++ b/t/preproc-demo.sh
@@ -213,8 +213,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