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

durin42 (Augie Fackler) phabricator at mercurial-scm.org
Wed Nov 28 12:54:43 EST 2018


durin42 updated this revision to Diff 12615.

REPOSITORY
  rHG Mercurial

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

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

AFFECTED FILES
  tests/test-fuzz-targets.t

CHANGE DETAILS

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,21 @@
 
   $ 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.
+
+  $ GMAKE=`which gmake`
+  $ if [ -n "$GMAKE" -a -x $GMAKE ] ; 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



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


More information about the Mercurial-devel mailing list