From 4a4cc26d58c5ecff941b01c08491101b5b64f1fa Mon Sep 17 00:00:00 2001
From: Matthias Volk <matthias.volk@cs.rwth-aachen.de>
Date: Tue, 30 Jan 2018 11:57:36 +0100
Subject: [PATCH] Replaced travis_wait with custom function

---
 .travis.yml               | 20 ++++++++++----------
 travis/build-helper.sh    | 13 +++++++++++++
 travis/generate_travis.py |  4 ++--
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c34dd94b5..1a0e0c923 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,7 +48,7 @@ jobs:
         - rm -rf build
         - travis/install_linux.sh
       script:
-        - travis_wait 60 travis/build.sh Build1
+        - travis/build.sh Build1
       before_cache:
         - docker cp storm:/storm/. .
       after_failure:
@@ -61,7 +61,7 @@ jobs:
         - rm -rf build
         - travis/install_linux.sh
       script:
-        - travis_wait 60 travis/build.sh Build1
+        - travis/build.sh Build1
       before_cache:
         - docker cp storm:/storm/. .
       after_failure:
@@ -79,7 +79,7 @@ jobs:
       install:
         - travis/install_linux.sh
       script:
-        - travis_wait 60 travis/build.sh Build2
+        - travis/build.sh Build2
       before_cache:
         - docker cp storm:/storm/. .
       after_failure:
@@ -91,7 +91,7 @@ jobs:
       install:
         - travis/install_linux.sh
       script:
-        - travis_wait 60 travis/build.sh Build2
+        - travis/build.sh Build2
       before_cache:
         - docker cp storm:/storm/. .
       after_failure:
@@ -109,7 +109,7 @@ jobs:
       install:
         - travis/install_linux.sh
       script:
-        - travis_wait 60 travis/build.sh Build3
+        - travis/build.sh Build3
       before_cache:
         - docker cp storm:/storm/. .
       after_failure:
@@ -121,7 +121,7 @@ jobs:
       install:
         - travis/install_linux.sh
       script:
-        - travis_wait 60 travis/build.sh Build3
+        - travis/build.sh Build3
       before_cache:
         - docker cp storm:/storm/. .
       after_failure:
@@ -139,7 +139,7 @@ jobs:
       install:
         - travis/install_linux.sh
       script:
-        - travis_wait 60 travis/build.sh BuildLast
+        - travis/build.sh BuildLast
       before_cache:
         - docker cp storm:/storm/. .
       after_failure:
@@ -151,7 +151,7 @@ jobs:
       install:
         - travis/install_linux.sh
       script:
-        - travis_wait 60 travis/build.sh BuildLast
+        - travis/build.sh BuildLast
       before_cache:
         - docker cp storm:/storm/. .
       after_failure:
@@ -169,7 +169,7 @@ jobs:
       install:
         - travis/install_linux.sh
       script:
-        - travis_wait 60 travis/build.sh TestAll
+        - travis/build.sh TestAll
       before_cache:
         - docker cp storm:/storm/. .
       after_failure:
@@ -185,7 +185,7 @@ jobs:
       install:
         - travis/install_linux.sh
       script:
-        - travis_wait 60 travis/build.sh TestAll
+        - travis/build.sh TestAll
       before_cache:
         - docker cp storm:/storm/. .
       after_failure:
diff --git a/travis/build-helper.sh b/travis/build-helper.sh
index 7d722dc99..5d3add692 100755
--- a/travis/build-helper.sh
+++ b/travis/build-helper.sh
@@ -10,6 +10,14 @@ travis_fold() {
   echo -en "travis_fold:${action}:${name}\r"
 }
 
+# Helper to write output every minute
+function bell() {
+  while true; do
+    echo "travis_wait for it..."
+    sleep 60
+  done
+}
+
 # Helper for distinguishing between different runs
 run() {
   case "$1" in
@@ -121,4 +129,9 @@ fi
 ruby travis/mtime_cache/mtime_cache.rb -g travis/mtime_cache/globs.txt -c travis/mtime_cache/cache.json
 travis_fold end mtime
 
+# Run and print output to avoid travis timeout
+bell &
+bellPID=$!
 run "$1"
+kill $bellPID
+
diff --git a/travis/generate_travis.py b/travis/generate_travis.py
index 05af4c49d..1abb07e9d 100644
--- a/travis/generate_travis.py
+++ b/travis/generate_travis.py
@@ -93,7 +93,7 @@ if __name__ == "__main__":
                     buildConfig += "        - rm -rf build\n"
                 buildConfig += "        - travis/install_osx.sh\n"
                 buildConfig += "      script:\n"
-                buildConfig += "        - travis_wait 60 travis/build.sh {}\n".format(stage[1])
+                buildConfig += "        - travis/build.sh {}\n".format(stage[1])
                 buildConfig += "      after_failure:\n"
                 buildConfig += "        - find build -iname '*err*.log' -type f -print -exec cat {} \;\n"
             s += buildConfig
@@ -114,7 +114,7 @@ if __name__ == "__main__":
                     buildConfig += "        - rm -rf build\n"
                 buildConfig += "        - travis/install_linux.sh\n"
                 buildConfig += "      script:\n"
-                buildConfig += "        - travis_wait 60 travis/build.sh {}\n".format(stage[1])
+                buildConfig += "        - travis/build.sh {}\n".format(stage[1])
                 buildConfig += "      before_cache:\n"
                 buildConfig += "        - docker cp storm:/storm/. .\n"
                 buildConfig += "      after_failure:\n"