Refactored travis build script

8 years ago · 556a7df213
1 changed files with 7 additions and 17 deletions
--- a/travis/build-helper.sh
+++ b/travis/build-helper.sh
@ -27,28 +27,18 @@ run() {
    fi
    echo
    travis_fold end cmake
-    # Make
-    travis_fold start make
-    make -j$N_JOBS
-    travis_fold end make
-    touch skip.txt
-    ;;
-
-  Build2 | Build3)
-    # Make (run 2-3)
-    travis_fold start make
-    cd build
-    make -j$N_JOBS
-    travis_fold end make
-    touch skip.txt
-    ;;
+    ;& # fall-through to make step

-  Build4)
-    # Make (run 2-4)
+  Build2 | Build3 | Build4)
+    # Make
    travis_fold start make
    cd build
    make -j$N_JOBS
    travis_fold end make
+    if [[ "$1" != "Build4" ]]
+    then
+        touch skip.txt
+    fi
    ;;

  TestAll)