tests: avoid few lingering $MAKE redirections
authorStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 23 May 2013 18:48:03 +0000 (20:48 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 23 May 2013 18:48:03 +0000 (20:48 +0200)
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>
t/fort2.sh
t/preproc-demo.sh

index d614452..c2c0f03 100644 (file)
@@ -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
index 4c1b2d9..1f29057 100644 (file)
@@ -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