Replaced switch-fallthrough in travis

travis/build-helper.sh

@@ -13,9 +13,11 @@ travis_fold() {
 # Helper for distinguishing between different runs
 run() {
   case "$1" in
-  Build1)
-    travis_fold start cmake
+  Build1 | Build2 | Build3 | Build4)
+    if [[ "$1" == "Build1" ]]
+    then
         # CMake
+        travis_fold start cmake
         mkdir build
         cd build
         cmake .. "${CMAKE_ARGS[@]}"
@@ -28,17 +30,19 @@ run() {
         echo
         cd ..
         travis_fold end cmake
-    ;& # fall-through to make step
+    fi
 
-  Build2 | Build3 | Build4)
     # Make
     travis_fold start make
     cd build
     make -j$N_JOBS
     travis_fold end make
+    # Set skip-file
     if [[ "$1" != "Build4" ]]
     then
         touch skip.txt
+    else
+        rm -rf skip.txt
     fi
     ;;