Accommodate MacOS lack of timeout command

rjust · Feb 5, 2020 · 5ac3a66 · 5ac3a66
1 parent 5f06373
commit 5ac3a66
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/framework/test/test_bug_mining.sh b/framework/test/test_bug_mining.sh
@@ -40,6 +40,11 @@ _check_output() {
     rm -f "$actual.sorted" "$expected.sorted"
 }
 
+# MacOS does not install the timeout command by default.
+if [ "$(uname)" = "Darwin" ] ; then
+  function timeout() { perl -e 'alarm shift; exec @ARGV' "$@"; }
+fi
+
 # Download the remote resource to a local file of the same name, if the
 # remote resource is newer.  Works around connections that hang.  Takes a
 # single command-line argument, a URL.
@@ -48,7 +53,7 @@ download_url() {
     if [ "$(uname)" = "Darwin" ] ; then
         wget -nv -N "$@"
     else
-	timeout 5m curl -s -S -R -L -O -z "$BASENAME" "$@" || (echo "retrying curl $@" && rm -f "$BASENAME" && curl -R -L -O -z "$BASENAME" "$@")
+	timeout 300 curl -s -S -R -L -O -z "$BASENAME" "$@" || (echo "retrying curl $@" && rm -f "$BASENAME" && curl -R -L -O -z "$BASENAME" "$@")
     fi
 }
 

diff --git a/init.sh b/init.sh
@@ -40,6 +40,11 @@ mkdir -p "$DIR_LIB_GEN" && mkdir -p "$DIR_LIB_RT" && mkdir -p "$DIR_LIB_GRADLE"
 # Utility functions
 #
 
+# MacOS does not install the timeout command by default.
+if [ "$(uname)" = "Darwin" ] ; then
+  function timeout() { perl -e 'alarm shift; exec @ARGV' "$@"; }
+fi
+
 # Download the remote resource to a local file of the same name, if the
 # remote resource is newer.  Works around connections that hang.  Takes a
 # single command-line argument, a URL.
@@ -48,7 +53,7 @@ download_url() {
     if [ "$(uname)" = "Darwin" ] ; then
         wget -nv -N "$@"
     else
-	timeout 5m curl -s -S -R -L -O -z "$BASENAME" "$@" || (echo "retrying curl $@" && rm -f "$BASENAME" && curl -R -L -O -z "$BASENAME" "$@")
+	timeout 300 curl -s -S -R -L -O -z "$BASENAME" "$@" || (echo "retrying curl $@" && rm -f "$BASENAME" && curl -R -L -O -z "$BASENAME" "$@")
     fi
 }
 

diff --git a/project_repos/get_repos.sh b/project_repos/get_repos.sh
@@ -15,6 +15,11 @@ clean() {
     README 
 }
 
+# MacOS does not install the timeout command by default.
+if [ "$(uname)" = "Darwin" ] ; then
+  function timeout() { perl -e 'alarm shift; exec @ARGV' "$@"; }
+fi
+
 # Download the remote resource to a local file of the same name, if the
 # remote resource is newer.  Works around connections that hang.  Takes a
 # single command-line argument, a URL.
@@ -23,7 +28,7 @@ download_url() {
     if [ "$(uname)" = "Darwin" ] ; then
         wget -nv -N "$@"
     else
-	timeout 5m curl -s -S -R -L -O -z "$BASENAME" "$@" || (echo "retrying curl $@" && rm -f "$BASENAME" && curl -R -L -O -z "$BASENAME" "$@")
+	timeout 300 curl -s -S -R -L -O -z "$BASENAME" "$@" || (echo "retrying curl $@" && rm -f "$BASENAME" && curl -R -L -O -z "$BASENAME" "$@")
     fi
 }