diff --git a/.travis.yml b/.travis.yml index 164742ea8efe12e71be45ad734c4af7f19afc7b6..7c6338a45017351fec26c208fdad02890eca253b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -209,6 +209,10 @@ matrix: addons: *gcc5 env: CC=gcc-5 TESTS=linearelliptic_swipdg_discretization_sgrid BLD=${DBG} CXX=g++-5 - os: linux + addons: *gcc5 + env: CC=gcc-5 TESTS=linearelliptic_swipdg_estimator_alugrid BLD=${DBG} CXX=g++-5 + - os: linux + compiler: gcc addons: *gcc5 env: CC=gcc-5 TESTS=hyperbolic_fv_discretization_yaspgrid BLD=${DBG} CXX=g++-5 - os: linux @@ -264,6 +268,10 @@ matrix: addons: *clang37 env: CC=clang-3.7 TESTS=linearelliptic_swipdg_discretization_sgrid BLD=${DBG} CXX=clang++-3.7 - os: linux + addons: *clang37 + env: CC=clang-3.7 TESTS=linearelliptic_swipdg_estimator_alugrid BLD=${DBG} CXX=clang++-3.7 + - os: linux + compiler: clang addons: *clang37 env: CC=clang-3.7 TESTS=hyperbolic_fv_discretization_yaspgrid BLD=${DBG} CXX=clang++-3.7 - os: linux diff --git a/dune/gdt/test/CMakeLists.txt b/dune/gdt/test/CMakeLists.txt index 292da563e17bb970be17daf56bbcf62b01012db5..453c98e290e46f7dab2f8583f65c571cfa5b5ae7 100644 --- a/dune/gdt/test/CMakeLists.txt +++ b/dune/gdt/test/CMakeLists.txt @@ -40,10 +40,12 @@ foreach (test ${testnames}) list(APPEND linearelliptic_cg_alugrid_test_binaries ${test}) elseif (${test} MATCHES linearelliptic__cg AND ${test} MATCHES sgrid) list(APPEND linearelliptic_cg_sgrid_test_binaries ${test}) - elseif (${test} MATCHES linearelliptic__swipdg AND ${test} MATCHES alugrid) - list(APPEND linearelliptic_swipdg_alugrid_test_binaries ${test}) - elseif (${test} MATCHES linearelliptic__swipdg AND ${test} MATCHES sgrid) - list(APPEND linearelliptic_swipdg_sgrid_test_binaries ${test}) + elseif (${test} MATCHES linearelliptic__swipdg_discretization AND ${test} MATCHES alugrid) + list(APPEND linearelliptic_swipdg_discretization_alugrid_test_binaries ${test}) + elseif (${test} MATCHES linearelliptic__swipdg_discretization AND ${test} MATCHES sgrid) + list(APPEND linearelliptic_swipdg_discretization_sgrid_test_binaries ${test}) + elseif (${test} MATCHES linearelliptic__swipdg_estimators) + list(APPEND linearelliptic_swipdg_estimator_alugrid_test_binaries ${test}) elseif (${test} MATCHES hyperbolic AND ${test} MATCHES yaspgrid) list(APPEND hyperbolic_yaspgrid_test_binaries ${test}) else (${test}) @@ -61,8 +63,9 @@ add_custom_target(test_binaries_prolongation_fem DEPENDS ${prolongations_fem_tes add_custom_target(test_binaries_prolongation_pdelab DEPENDS ${prolongations_pdelab_test_binaries}) add_custom_target(test_binaries_linearelliptic_cg_discretization_alugrid DEPENDS ${linearelliptic_cg_alugrid_test_binaries}) add_custom_target(test_binaries_linearelliptic_cg_discretization_sgrid DEPENDS ${linearelliptic_cg_sgrid_test_binaries}) -add_custom_target(test_binaries_linearelliptic_swipdg_discretization_alugrid DEPENDS ${linearelliptic_swipdg_alugrid_test_binaries}) -add_custom_target(test_binaries_linearelliptic_swipdg_discretization_sgrid DEPENDS ${linearelliptic_swipdg_sgrid_test_binaries}) +add_custom_target(test_binaries_linearelliptic_swipdg_discretization_alugrid DEPENDS ${linearelliptic_swipdg_discretization_alugrid_test_binaries}) +add_custom_target(test_binaries_linearelliptic_swipdg_discretization_sgrid DEPENDS ${linearelliptic_swipdg_discretization_sgrid_test_binaries}) +add_custom_target(test_binaries_linearelliptic_swipdg_estimator_alugrid DEPENDS ${linearelliptic_swipdg_estimator_alugrid_test_binaries}) add_custom_target(test_binaries_hyperbolic_fv_discretization_yaspgrid DEPENDS ${hyperbolic_yaspgrid_test_binaries}) add_custom_target(test_binaries_other DEPENDS ${other_binaries})