diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c9338c55001604a041d734ca58c67671458b7b51..ae96208da8541f44fc3d5cd468a07694cf2f003d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -990,7 +990,7 @@ msvc-14.1_MpiOnly: - cmake .. -DWALBERLA_BUILD_TESTS=ON -DWALBERLA_BUILD_BENCHMARKS=ON -DWALBERLA_BUILD_TUTORIALS=ON -DWALBERLA_BUILD_TOOLS=ON -DWALBERLA_BUILD_WITH_MPI=$WALBERLA_BUILD_WITH_MPI -DWALBERLA_BUILD_WITH_PYTHON=$WALBERLA_BUILD_WITH_PYTHON -DWALBERLA_BUILD_WITH_OPENMP=$WALBERLA_BUILD_WITH_OPENMP -DWALBERLA_BUILD_WITH_CUDA=$WALBERLA_BUILD_WITH_CUDA -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DWARNING_ERROR=ON - cmake . -LAH - make -j $NUM_BUILD_CORES -l $NUM_CORES - - ctest -LE $CTEST_EXCLUDE_LABELS -C $CMAKE_BUILD_TYPE --output-on-failure -j $NUM_CORES + - ctest -LE "$CTEST_EXCLUDE_LABELS|cuda" -C $CMAKE_BUILD_TYPE --output-on-failure -j $NUM_CORES tags: - mac @@ -998,7 +998,7 @@ mac_Serial_Dbg: <<: *mac_build_definition variables: CMAKE_BUILD_TYPE: "DebugOptimized" - CTEST_EXCLUDE_LABELS: "longrun|cuda" + CTEST_EXCLUDE_LABELS: "longrun" WALBERLA_BUILD_WITH_MPI: "OFF" WALBERLA_BUILD_WITH_OPENMP: "OFF" WALBERLA_BUILD_WITH_PYTHON: "ON" @@ -1008,7 +1008,7 @@ mac_Serial: <<: *mac_build_definition variables: CMAKE_BUILD_TYPE: "Release" - CTEST_EXCLUDE_LABELS: "longrun|cuda" + CTEST_EXCLUDE_LABELS: "longrun" WALBERLA_BUILD_WITH_MPI: "OFF" WALBERLA_BUILD_WITH_OPENMP: "OFF" WALBERLA_BUILD_WITH_PYTHON: "ON" @@ -1018,7 +1018,7 @@ mac_MpiOnly_Dbg: <<: *mac_build_definition variables: CMAKE_BUILD_TYPE: "DebugOptimized" - CTEST_EXCLUDE_LABELS: "longrun|cuda" + CTEST_EXCLUDE_LABELS: "longrun" WALBERLA_BUILD_WITH_MPI: "ON" WALBERLA_BUILD_WITH_OPENMP: "OFF" WALBERLA_BUILD_WITH_PYTHON: "ON" @@ -1028,7 +1028,7 @@ mac_MpiOnly: <<: *mac_build_definition variables: CMAKE_BUILD_TYPE: "Release" - CTEST_EXCLUDE_LABELS: "longrun|cuda" + CTEST_EXCLUDE_LABELS: "longrun" WALBERLA_BUILD_WITH_MPI: "ON" WALBERLA_BUILD_WITH_OPENMP: "OFF" WALBERLA_BUILD_WITH_PYTHON: "ON"