Patchwork D5269: tests: sniff for /usr/local/bin/gmake and use it in test-fuzz-targets.t

login
register
mail settings
Submitter phabricator
Date Nov. 30, 2018, 12:01 p.m.
Message ID <a10b9f22ee346cf438810eee7f4e3693@localhost.localdomain>
Download mbox | patch
Permalink /patch/36875/
State Not Applicable
Headers show

Comments

phabricator - Nov. 30, 2018, 12:01 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG6c01fad8de32: tests: sniff for /usr/local/bin/gmake and use it in test-fuzz-targets.t (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5269?vs=12657&id=12660

REVISION DETAIL
  https://phab.mercurial-scm.org/D5269

AFFECTED FILES
  tests/test-fuzz-targets.t

CHANGE DETAILS




To: durin42, #hg-reviewers
Cc: yuja, mercurial-devel

Patch

diff --git a/tests/test-fuzz-targets.t b/tests/test-fuzz-targets.t
--- a/tests/test-fuzz-targets.t
+++ b/tests/test-fuzz-targets.t
@@ -2,11 +2,20 @@ 
 
   $ cd $TESTDIR/../contrib/fuzz
 
+which(1) could exit nonzero, but that's fine because we'll still end
+up without a valid executable, so we don't need to check $? here.
+
+  $ if which gmake >/dev/null 2>&1; then
+  >     MAKE=gmake
+  > else
+  >     MAKE=make
+  > fi
+
 #if clang-libfuzzer
-  $ make -s clean all
+  $ $MAKE -s clean all
 #endif
 #if no-clang-libfuzzer clang-6.0
-  $ make -s clean all CC=clang-6.0 CXX=clang++-6.0
+  $ $MAKE -s clean all CC=clang-6.0 CXX=clang++-6.0
 #endif
 #if no-clang-libfuzzer no-clang-6.0
   $ exit 80