-$MAKE check >out 2>&1 || { cat out; Exit1; }
-cat out
-# The simple-tests driver does not strip VPATH components from
-# the name of the test, but the parallel-tests driver should.
-if test x"$am_parallel_tests" = x"yes"; then
- grep '\.\./foo' out && Exit 1
- grep '^PASS: foo.test *$' out
+run_make -M check
+# The serial test driver does not strip VPATH components from
+# the name of the test, but the parallel driver should.
+if test x"$am_serial_tests" = x"yes"; then
+ grep '^PASS: .*foo\.test *$' output