Skip to content

Commit

Permalink
Use timeout --version to check for GNU timeout
Browse files Browse the repository at this point in the history
Fixes `make units` on MSYS 1.0.
Note: `which timeout` succeeds even for MS timeout
(c:\windows\system32\timeout.exe).
  • Loading branch information
ntrel committed Feb 26, 2015
1 parent be5628f commit 2c7080b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile.in
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down

0 comments on commit 2c7080b

Please sign in to comment.