Merge pull request #1555 from masatake/using-bamke-as-make

Using bmake as make

circle.yml

@@ -13,13 +13,13 @@ jobs:
        - run:
            name: Install build tools
            command: |
-             dnf -y install gcc automake autoconf pkgconfig make aspell-devel aspell-en libxml2-devel jansson-devel libyaml-devel || :
+             dnf -y install gcc automake autoconf pkgconfig bmake aspell-devel aspell-en libxml2-devel jansson-devel libyaml-devel || :
        - run:
            name: Build
            command: |
              bash ./autogen.sh
              ./configure --enable-debugging
-             make -j 2
+             bmake -j 2
        - run:
            name: Test
            command: |

configure.ac

@@ -306,6 +306,13 @@ if ! test "${GIT+set}" = "set"; then
 fi
 AM_CONDITIONAL([BUILD_IN_GIT_REPO], [test "x${in_git_repo}" = "xyes"])
 
+have_timeout=no
+AC_CHECK_PROGS([TESTING_TIMEOUT], [timeout])
+if test "${TESTING_TIMEOUT+set}" = "set"; then
+	have_timeout=yes
+fi
+AM_CONDITIONAL([HAVE_TIMEOUT], [test "x${have_timeout}" = "xyes"])
+
 
 # Check for temporary directory
 AC_MSG_CHECKING(directory to use for temporary files)

makefiles/testing.mak

@@ -7,7 +7,13 @@ clean-local: clean-units clean-tmain
 
 CTAGS_TEST = ./ctags$(EXEEXT)
 READ_TEST = ./readtags$(EXEEXT)
-TIMEOUT=
+
+if HAVE_TIMEOUT
+TIMEOUT = 1
+else
+TIMEOUT = 0
+endif
+
 LANGUAGES=
 CATEGORIES=
 UNITS=
@@ -17,7 +23,6 @@ UNITS=
 #
 # SHELL must be dash or bash.
 #
-fuzz: TIMEOUT := $(shell timeout --version > /dev/null 2>&1 && echo 1 || echo 0)
 fuzz: $(CTAGS_TEST)
 	@ \
 	if test -n "$${ZSH_VERSION+set}"; then set -o SH_WORD_SPLIT; fi; \
@@ -66,7 +71,6 @@ chop: $(CTAGS_TEST)
 #
 # UNITS Target
 #
-units: TIMEOUT := $(shell timeout --version > /dev/null 2>&1 && echo 10 || echo 0)
 units: $(CTAGS_TEST)
 	@ \
 	if test -n "$${ZSH_VERSION+set}"; then set -o SH_WORD_SPLIT; fi; \
@@ -85,7 +89,7 @@ units: $(CTAGS_TEST)
 		--categories=$(CATEGORIES) \
 		--units=$(UNITS) \
 		$${VALGRIND} --run-shrink \
-		--with-timeout=$(TIMEOUT) \
+		--with-timeout=`$(TIMEOUT) '*' 10`\
 		$${SHOW_DIFF_OUTPUT}"; \
 	 TRAVIS=$(TRAVIS) APPVEYOR=$(APPVEYOR) \
 		 $(SHELL) $${c} $(srcdir)/Units $${builddir}/Units