From d7e2c40455f46926cde96b8799813d5ecf8ef560 Mon Sep 17 00:00:00 2001 From: Andi McClure Date: Thu, 1 Dec 2016 14:08:25 -0500 Subject: [PATCH] Modify Jenkins scripts to enable babysitter script on Cygwin --- scripts/ci/run-step.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/run-step.sh b/scripts/ci/run-step.sh index 115ee123566..4ea5fbc4c3a 100755 --- a/scripts/ci/run-step.sh +++ b/scripts/ci/run-step.sh @@ -1,6 +1,6 @@ #!/bin/bash -e TIMEOUTCMD=`dirname "${BASH_SOURCE[0]}"`/babysitter -if [[ "$OSTYPE" == "cygwin" ]] || ! ${TIMEOUTCMD} -h >/dev/null 2>&1; then +if ! ${TIMEOUTCMD} -h >/dev/null 2>&1; then TIMEOUTCMD=timeout # fall back to timeout if babysitter doesn't work (e.g. python not installed or wrong version) fi -- 2.25.1