Browse Source

Replaced switch-fallthrough in travis

tempestpy_adaptions
Matthias Volk 7 years ago
parent
commit
afd6c21c7d
  1. 34
      travis/build-helper.sh

34
travis/build-helper.sh

@ -13,32 +13,36 @@ travis_fold() {
# Helper for distinguishing between different runs # Helper for distinguishing between different runs
run() { run() {
case "$1" in case "$1" in
Build1)
travis_fold start cmake
# CMake
mkdir build
cd build
cmake .. "${CMAKE_ARGS[@]}"
echo
if [ -f "CMakeFiles/CMakeError.log" ]
Build1 | Build2 | Build3 | Build4)
if [[ "$1" == "Build1" ]]
then then
echo "Content of CMakeFiles/CMakeError.log:"
cat CMakeFiles/CMakeError.log
# CMake
travis_fold start cmake
mkdir build
cd build
cmake .. "${CMAKE_ARGS[@]}"
echo
if [ -f "CMakeFiles/CMakeError.log" ]
then
echo "Content of CMakeFiles/CMakeError.log:"
cat CMakeFiles/CMakeError.log
fi
echo
cd ..
travis_fold end cmake
fi fi
echo
cd ..
travis_fold end cmake
;& # fall-through to make step
Build2 | Build3 | Build4)
# Make # Make
travis_fold start make travis_fold start make
cd build cd build
make -j$N_JOBS make -j$N_JOBS
travis_fold end make travis_fold end make
# Set skip-file
if [[ "$1" != "Build4" ]] if [[ "$1" != "Build4" ]]
then then
touch skip.txt touch skip.txt
else
rm -rf skip.txt
fi fi
;; ;;

Loading…
Cancel
Save