From c1137f41140a3914d636bcf3a949e441161cc3f3 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sun, 8 Jul 2012 10:22:45 +0200 Subject: [PATCH] [ng] tests: remove several 'using_gmake' calls In the Automake-NG testsuite, $MAKE is always GNU make. * t/parallel-tests9.sh: Don't call 'using_gmake'; assume it would unconditionally return true. * t/tap-recheck.sh: Likewise. * t/test-driver-custom-multitest-recheck.sh: Likewise. * t/test-driver-custom-multitest-recheck2.sh: Likewise. * t/test-metadata-recheck.sh: Likewise. Signed-off-by: Stefano Lattarini --- t/parallel-tests9.sh | 1 - t/tap-recheck.sh | 7 ------- t/test-driver-custom-multitest-recheck.sh | 8 -------- t/test-driver-custom-multitest-recheck2.sh | 6 ------ t/test-metadata-recheck.sh | 1 - 5 files changed, 23 deletions(-) diff --git a/t/parallel-tests9.sh b/t/parallel-tests9.sh index ea9dba665..d9f947990 100755 --- a/t/parallel-tests9.sh +++ b/t/parallel-tests9.sh @@ -62,7 +62,6 @@ count_test_results total=3 pass=1 fail=1 skip=0 xfail=0 xpass=0 error=1 # Running this two times in a row should produce the same results the # second time. for i in 1 2; do - using_gmake || $sleep # Required by BSD make. $MAKE recheck >stdout && { cat stdout; exit 1; } cat stdout count_test_results total=2 pass=0 fail=1 skip=0 xfail=0 xpass=0 error=1 diff --git a/t/tap-recheck.sh b/t/tap-recheck.sh index 82cd7e1f4..b1585552a 100755 --- a/t/tap-recheck.sh +++ b/t/tap-recheck.sh @@ -131,7 +131,6 @@ for vpath in : false; do count_test_results total=9 pass=3 fail=2 xpass=1 xfail=1 skip=1 error=1 : Let us make b.test pass. - using_gmake || $sleep # Required by BSD make. echo OK > b.ok do_recheck --fail # a.test has been successful the first time, so no need to re-run it. @@ -143,7 +142,6 @@ for vpath in : false; do count_test_results total=7 pass=2 fail=2 xpass=1 xfail=1 skip=1 error=0 : Let us make the first part of c.test pass. - using_gmake || $sleep # Required by BSD make. echo OK > c.pass do_recheck --fail test ! -e a.run @@ -153,7 +151,6 @@ for vpath in : false; do count_test_results total=5 pass=1 fail=1 xpass=1 xfail=1 skip=1 error=0 : Let us make also the second part of c.test pass. - using_gmake || $sleep # Required by BSD make. echo KO > c.xfail do_recheck --fail test ! -e a.run @@ -164,7 +161,6 @@ for vpath in : false; do : Nothing changed, so only d.test should be run. for i in 1 2; do - using_gmake || $sleep # Required by BSD make. do_recheck --fail test ! -e a.run test ! -e b.run @@ -174,7 +170,6 @@ for vpath in : false; do done : Let us make d.test run more testcases, and experience _more_ failures. - using_gmake || $sleep # Required by BSD make. echo 'test_count=9' > d.count unindent > d.extra <<'END' echo 'ok # SKIP s' @@ -196,7 +191,6 @@ END count_test_results total=11 pass=2 fail=4 xpass=1 xfail=0 skip=2 error=2 : Let us finally make d.test pass. - using_gmake || $sleep # Required by BSD make. echo 'test_count=1' > d.count echo : > d.extra do_recheck --pass @@ -207,7 +201,6 @@ END count_test_results total=1 pass=0 fail=0 xpass=0 xfail=0 skip=1 error=0 : All tests have been successful or skipped, nothing should be re-run. - using_gmake || $sleep # Required by BSD make. do_recheck --pass test ! -e a.run test ! -e b.run diff --git a/t/test-driver-custom-multitest-recheck.sh b/t/test-driver-custom-multitest-recheck.sh index be3ed1133..04b3c540b 100755 --- a/t/test-driver-custom-multitest-recheck.sh +++ b/t/test-driver-custom-multitest-recheck.sh @@ -107,7 +107,6 @@ for vpath in : false; do $srcdir/configure : A "make recheck" in a clean tree should run no tests. - using_gmake || $sleep # Required by BSD make. do_recheck --pass cat test-suite.log test ! -e a.run @@ -132,7 +131,6 @@ for vpath in : false; do count_test_results total=9 pass=3 fail=2 xpass=1 xfail=1 skip=1 error=1 : Let us make b.test pass. - using_gmake || $sleep # Required by BSD make. echo OK > b.ok do_recheck --fail # a.test has been successful the first time, so no need to re-run it. @@ -144,7 +142,6 @@ for vpath in : false; do count_test_results total=7 pass=2 fail=2 xpass=1 xfail=1 skip=1 error=0 : Let us make the first part of c.test pass. - using_gmake || $sleep # Required by BSD make. echo OK > c.pass do_recheck --fail test ! -e a.run @@ -154,7 +151,6 @@ for vpath in : false; do count_test_results total=5 pass=1 fail=1 xpass=1 xfail=1 skip=1 error=0 : Let us make also the second part of c.test pass. - using_gmake || $sleep # Required by BSD make. echo KO > c.xfail do_recheck --fail test ! -e a.run @@ -165,7 +161,6 @@ for vpath in : false; do : Nothing changed, so only d.test should be run. for i in 1 2; do - using_gmake || $sleep # Required by BSD make. do_recheck --fail test ! -e a.run test ! -e b.run @@ -175,7 +170,6 @@ for vpath in : false; do done : Let us make d.test run more testcases, and experience _more_ failures. - using_gmake || $sleep # Required by BSD make. unindent > d.extra <<'END' echo SKIP: s echo FAIL: f 1 @@ -196,7 +190,6 @@ END count_test_results total=11 pass=2 fail=4 xpass=1 xfail=0 skip=2 error=2 : Let us finally make d.test pass. - using_gmake || $sleep # Required by BSD make. echo : > d.extra do_recheck --pass test ! -e a.run @@ -206,7 +199,6 @@ END count_test_results total=1 pass=0 fail=0 xpass=0 xfail=0 skip=1 error=0 : All tests have been successful or skipped, nothing should be re-run. - using_gmake || $sleep # Required by BSD make. do_recheck --pass test ! -e a.run test ! -e b.run diff --git a/t/test-driver-custom-multitest-recheck2.sh b/t/test-driver-custom-multitest-recheck2.sh index 9e9610f76..a622c237f 100755 --- a/t/test-driver-custom-multitest-recheck2.sh +++ b/t/test-driver-custom-multitest-recheck2.sh @@ -101,7 +101,6 @@ for vpath in : false; do test ! -e c.run : a.test was successful the first time, no need to re-run it. - using_gmake || $sleep # Required by BSD make. $MAKE TESTS=a.test recheck >stdout || { cat stdout; exit 1; } cat stdout count_test_results total=0 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=0 @@ -110,7 +109,6 @@ for vpath in : false; do test ! -e c.run : b.test failed, it should be re-run. And make it pass this time. - using_gmake || $sleep # Required by BSD make. echo OK > b.ok $MAKE TESTS=b recheck >stdout || { cat stdout; exit 1; } cat stdout @@ -122,14 +120,12 @@ for vpath in : false; do rm -f *.run : No need to re-run a.test or b.test anymore. - using_gmake || $sleep # Required by BSD make. $MAKE TESTS=b recheck >stdout || { cat stdout; exit 1; } cat stdout count_test_results total=0 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=0 test ! -e a.run test ! -e b.run test ! -e c.run - using_gmake || $sleep # Required by BSD make. $MAKE TESTS='a.test b.test' recheck >stdout || { cat stdout; exit 1; } cat stdout count_test_results total=0 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=0 @@ -153,7 +149,6 @@ for vpath in : false; do : c.test contained and hard error the last time, so it should be re-run. : This time, make it pass # Use 'echo', not ':'; see comments above for why. - using_gmake || $sleep # Required by BSD make. echo dummy > c.ok $MAKE TESTS='c.test a.test' recheck >stdout || { cat stdout; exit 1; } cat stdout @@ -166,7 +161,6 @@ for vpath in : false; do : Nothing should be rerun anymore, as all tests have been eventually : successful. - using_gmake || $sleep # Required by BSD make. $MAKE recheck >stdout || { cat stdout; exit 1; } cat stdout count_test_results total=0 pass=0 fail=0 xpass=0 xfail=0 skip=0 error=0 diff --git a/t/test-metadata-recheck.sh b/t/test-metadata-recheck.sh index b4c0e9a29..0fe67d47f 100755 --- a/t/test-metadata-recheck.sh +++ b/t/test-metadata-recheck.sh @@ -153,7 +153,6 @@ rm -f *.run # fields indicating success, so "make recheck" must pass. Still, the # next "make recheck" call should still re-run the same set of tests. for iteration in 1 2; do - using_gmake || $sleep # Required by BSD make. $MAKE recheck ls -l for t in $rechecked; do test -f $t.run; done -- 2.47.2