From d58533b18e5f3ea755b646f38e2579e76d0ff90a Mon Sep 17 00:00:00 2001 From: Jacob Bachmeyer Date: Thu, 20 May 2021 17:06:49 -0500 Subject: Change test for [which make] to [which sh] --- ChangeLog | 5 +++++ testsuite/runtest.libs/utils.test | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e822401..bc20c48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,11 @@ * testsuite/lib/runtest.exp (runtest_copy_nested_testsuite_log): New procedure. Dumps log from nested run into main test log. + * testsuite/runtest.libs/utils.test: Change test for [which make] + to [which sh] because make(1) is not always available on non-GNU + systems but sh(1) exists on any Unix. GNU make is often installed + as "gmake" on non-GNU systems and may be the only "make" utility. + * testsuite/runtest.main/pr42399.exp (test_pr42399): Revise to ensure that a failure to produce any output at all in the inner test will be detected. This was discovered on Solaris 10. diff --git a/testsuite/runtest.libs/utils.test b/testsuite/runtest.libs/utils.test index f4b13dd..8be6a2e 100644 --- a/testsuite/runtest.libs/utils.test +++ b/testsuite/runtest.libs/utils.test @@ -139,12 +139,12 @@ if {[which [file join $objdir .. config.status]] != 0} { fail "which, absolute path to config.status" } -# Test 'which make'. +# Test 'which sh'. # -if {[which make] != 0} { - pass "which, make" +if {[which sh] != 0} { + pass "which, sh" } else { - fail "which, make" + fail "which, sh" } ### Do not adjust the comment on the next line. The grep test case -- cgit v1.1