From 2a8e58284cc1d4a67a264accc882900ac41167cd Mon Sep 17 00:00:00 2001
From: Matthias Volk <matthias.volk@cs.rwth-aachen.de>
Date: Fri, 26 Jan 2018 17:45:43 +0100
Subject: [PATCH] Next try with travis_wait

---
 .travis.yml               | 20 ++++++++++----------
 travis/build-helper.sh    |  2 +-
 travis/generate_travis.py |  6 +++---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7279e2999..669f831c5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,7 +48,7 @@ jobs:
         - rm -rf build
         - travis/install_linux.sh
       script:
-        - travis/build.sh Build1
+        - travis_wait 40 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/build.sh Build1
+        - travis_wait 40 travis/build.sh Build1
       before_cache:
         - docker cp storm:/storm/. .
       after_failure:
@@ -79,7 +79,7 @@ jobs:
       install:
         - travis/install_linux.sh
       script:
-        - travis/build.sh Build2
+        - travis_wait 40 travis/build.sh Build2
       before_cache:
         - docker cp storm:/storm/. .
       after_failure:
@@ -91,7 +91,7 @@ jobs:
       install:
         - travis/install_linux.sh
       script:
-        - travis/build.sh Build2
+        - travis_wait 40 travis/build.sh Build2
       before_cache:
         - docker cp storm:/storm/. .
       after_failure:
@@ -109,7 +109,7 @@ jobs:
       install:
         - travis/install_linux.sh
       script:
-        - travis/build.sh Build3
+        - travis_wait 40 travis/build.sh Build3
       before_cache:
         - docker cp storm:/storm/. .
       after_failure:
@@ -121,7 +121,7 @@ jobs:
       install:
         - travis/install_linux.sh
       script:
-        - travis/build.sh Build3
+        - travis_wait 40 travis/build.sh Build3
       before_cache:
         - docker cp storm:/storm/. .
       after_failure:
@@ -139,7 +139,7 @@ jobs:
       install:
         - travis/install_linux.sh
       script:
-        - travis/build.sh BuildLast
+        - travis_wait 40 travis/build.sh BuildLast
       before_cache:
         - docker cp storm:/storm/. .
       after_failure:
@@ -151,7 +151,7 @@ jobs:
       install:
         - travis/install_linux.sh
       script:
-        - travis/build.sh BuildLast
+        - travis_wait 40 travis/build.sh BuildLast
       before_cache:
         - docker cp storm:/storm/. .
       after_failure:
@@ -169,7 +169,7 @@ jobs:
       install:
         - travis/install_linux.sh
       script:
-        - travis/build.sh TestAll
+        - travis_wait 40 travis/build.sh TestAll
       before_cache:
         - docker cp storm:/storm/. .
       after_failure:
@@ -185,7 +185,7 @@ jobs:
       install:
         - travis/install_linux.sh
       script:
-        - travis/build.sh TestAll
+        - travis_wait 40 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 4aed04eee..7d722dc99 100755
--- a/travis/build-helper.sh
+++ b/travis/build-helper.sh
@@ -35,7 +35,7 @@ run() {
     # Make
     travis_fold start make
     cd build
-    travis_wait make -j$N_JOBS
+    make -j$N_JOBS
     travis_fold end make
     # Set skip-file
     if [[ "$1" != "BuildLast" ]]
diff --git a/travis/generate_travis.py b/travis/generate_travis.py
index b104661f1..71f719696 100644
--- a/travis/generate_travis.py
+++ b/travis/generate_travis.py
@@ -9,7 +9,7 @@ configs_linux = [
 # Configurations for Mac
 configs_mac = [
     # OS, compiler
-    ("osx", "clang", ""),
+#    ("osx", "clang", ""),
 ]
 
 # Build types
@@ -93,7 +93,7 @@ if __name__ == "__main__":
                     buildConfig += "        - rm -rf build\n"
                 buildConfig += "        - travis/install_osx.sh\n"
                 buildConfig += "      script:\n"
-                buildConfig += "        - travis/build.sh {}\n".format(stage[1])
+                buildConfig += "        - travis_wait 40 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/build.sh {}\n".format(stage[1])
+                buildConfig += "        - travis_wait 40 travis/build.sh {}\n".format(stage[1])
                 buildConfig += "      before_cache:\n"
                 buildConfig += "        - docker cp storm:/storm/. .\n"
                 buildConfig += "      after_failure:\n"