From 2c7080b5b1cc343da768b8b209561470c55d08eb Mon Sep 17 00:00:00 2001 From: Nick Treleaven Date: Thu, 26 Feb 2015 13:46:07 +0000 Subject: [PATCH] Use `timeout --version` to check for GNU timeout Fixes `make units` on MSYS 1.0. Note: `which timeout` succeeds even for MS timeout (c:\windows\system32\timeout.exe). --- Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 619082b2c3..d050da717a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -367,7 +367,7 @@ check: units # # SHELL must be dash or bash. # -fuzz: TIMEOUT := $(shell which timeout > /dev/null 2>&1 && echo 1 || echo 0) +fuzz: TIMEOUT := $(shell timeout --version > /dev/null 2>&1 && echo 1 || echo 0) fuzz: $(CTAGS_TEST) @ \ c="misc/units fuzz \ @@ -392,7 +392,7 @@ noise: $(CTAGS_TEST) # # UNITS Target # -units: TIMEOUT := $(shell which timeout > /dev/null 2>&1 && echo 5 || echo 0) +units: TIMEOUT := $(shell timeout --version > /dev/null 2>&1 && echo 5 || echo 0) units: $(CTAGS_TEST) @ \ c="misc/units run \