move dune/gdt/tests -> dune/gdt/test

CMakeLists.txt

@@ -64,7 +64,6 @@ add_subdirectory(m4)
 add_subdirectory(doc)
 add_subdirectory(dune)
 add_subdirectory(cmake/modules)
-add_subdirectory(test EXCLUDE_FROM_ALL)
 
 # finalize the dune project, e.g., generate config.h etc.
 finalize_dune_project(GENERATE_CONFIG_H_CMAKE)

dune/gdt/CMakeLists.txt

@@ -3,5 +3,5 @@
 # Copyright holders: Felix Schindler
 # License: BSD 2-Clause License (http://opensource.org/licenses/BSD-2-Clause)
 
-add_subdirectory(tests EXCLUDE_FROM_ALL)
+add_subdirectory(test EXCLUDE_FROM_ALL)
 

test/CMakeLists.txt → dune/gdt/test/CMakeLists.txt

@@ -15,15 +15,6 @@ endforeach (test ${testnames})
 
 END_TESTCASES()
 
-target_link_libraries(test_linearelliptic-cg-discretization_fem_eigen_alugrid    lib_test_linearelliptic_cg_discretizations_alugrid)
-target_link_libraries(test_linearelliptic-cg-discretization_fem_eigen_sgrid      lib_test_linearelliptic_cg_discretizations_sgrid)
-target_link_libraries(test_linearelliptic-cg-discretization_fem_istl_alugrid     lib_test_linearelliptic_cg_discretizations_alugrid)
-target_link_libraries(test_linearelliptic-cg-discretization_fem_istl_sgrid       lib_test_linearelliptic_cg_discretizations_sgrid)
-target_link_libraries(test_linearelliptic-cg-discretization_pdelab_eigen_alugrid lib_test_linearelliptic_cg_discretizations_alugrid)
-target_link_libraries(test_linearelliptic-cg-discretization_pdelab_eigen_sgrid   lib_test_linearelliptic_cg_discretizations_sgrid)
-target_link_libraries(test_linearelliptic-cg-discretization_pdelab_istl_alugrid  lib_test_linearelliptic_cg_discretizations_alugrid)
-target_link_libraries(test_linearelliptic-cg-discretization_pdelab_istl_sgrid    lib_test_linearelliptic_cg_discretizations_sgrid)
-
 # link spe10 data file if present
 if (NOT ${SPE10MODEL1DATA} STREQUAL "SPE10MODEL1DATA-NOTFOUND")
   set (SPE10MODEL1DATA_TARGET_FILENAME "${CMAKE_CURRENT_BINARY_DIR}/perm_case1.dat")
@@ -31,3 +22,5 @@ if (NOT ${SPE10MODEL1DATA} STREQUAL "SPE10MODEL1DATA-NOTFOUND")
     execute_process(COMMAND ln -s "${SPE10MODEL1DATA}" "${SPE10MODEL1DATA_TARGET_FILENAME}")
   endif(NOT EXISTS ${SPE10MODEL1DATA_TARGET_FILENAME})
 endif (NOT ${SPE10MODEL1DATA} STREQUAL "SPE10MODEL1DATA-NOTFOUND")
+
+add_subdirectory(linearelliptic)

dune/gdt/tests/linearelliptic/CMakeLists.txt → dune/gdt/test/linearelliptic/CMakeLists.txt

@@ -72,3 +72,12 @@ add_library(lib_test_linearelliptic_cg_discretizations_alugrid
             $<TARGET_OBJECTS:obj_tests_linearelliptic_eocexpectations_cg_spe10_2dalugrid>)
 add_dune_alugrid_flags(lib_test_linearelliptic_cg_discretizations_alugrid)
 
+#target_link_libraries(test_linearelliptic-cg-discretization_fem_eigen_alugrid    lib_test_linearelliptic_cg_discretizations_alugrid)
+#target_link_libraries(test_linearelliptic-cg-discretization_fem_eigen_sgrid      lib_test_linearelliptic_cg_discretizations_sgrid)
+#target_link_libraries(test_linearelliptic-cg-discretization_fem_istl_alugrid     lib_test_linearelliptic_cg_discretizations_alugrid)
+#target_link_libraries(test_linearelliptic-cg-discretization_fem_istl_sgrid       lib_test_linearelliptic_cg_discretizations_sgrid)
+#target_link_libraries(test_linearelliptic-cg-discretization_pdelab_eigen_alugrid lib_test_linearelliptic_cg_discretizations_alugrid)
+#target_link_libraries(test_linearelliptic-cg-discretization_pdelab_eigen_sgrid   lib_test_linearelliptic_cg_discretizations_sgrid)
+#target_link_libraries(test_linearelliptic-cg-discretization_pdelab_istl_alugrid  lib_test_linearelliptic_cg_discretizations_alugrid)
+#target_link_libraries(test_linearelliptic-cg-discretization_pdelab_istl_sgrid    lib_test_linearelliptic_cg_discretizations_sgrid)
+

dune/gdt/tests/linearelliptic/eocexpectations-cg-ao2013-2dalugrid.cxx → dune/gdt/test/linearelliptic/eocexpectations-cg-ao2013-2dalugrid.cxx

@@ -14,7 +14,7 @@
 
 namespace Dune {
 namespace GDT {
-namespace Tests {
+namespace Test {
 
 
 template <bool anything>
@@ -90,7 +90,7 @@ template class LinearEllipticEocExpectations<LinearElliptic::AO2013TestCase<ALUG
                                              LinearElliptic::ChooseDiscretizer::cg, 1>;
 
 
-} // namespace Tests
+} // namespace Test
 } // namespace GDT
 } // namespace Dune
 

dune/gdt/tests/linearelliptic/eocexpectations-cg-ao2013-2dsgrid.cxx → dune/gdt/test/linearelliptic/eocexpectations-cg-ao2013-2dsgrid.cxx

@@ -13,7 +13,7 @@
 
 namespace Dune {
 namespace GDT {
-namespace Tests {
+namespace Test {
 
 
 template <bool anything>
@@ -52,6 +52,6 @@ template class LinearEllipticEocExpectations<LinearElliptic::AO2013TestCase<SGri
                                              LinearElliptic::ChooseDiscretizer::cg, 1>;
 
 
-} // namespace Tests
+} // namespace Test
 } // namespace GDT
 } // namespace Dune

dune/gdt/tests/linearelliptic/eocexpectations-cg-er2007-2dalugrid.cxx → dune/gdt/test/linearelliptic/eocexpectations-cg-er2007-2dalugrid.cxx

@@ -15,7 +15,7 @@
 
 namespace Dune {
 namespace GDT {
-namespace Tests {
+namespace Test {
 
 
 template <bool anything>
@@ -67,7 +67,7 @@ template class LinearEllipticEocExpectations<LinearElliptic::ER2007TestCase<ALUG
                                              LinearElliptic::ChooseDiscretizer::cg, 1>;
 
 
-} // namespace Tests
+} // namespace Test
 } // namespace GDT
 } // namespace Dune
 

dune/gdt/tests/linearelliptic/eocexpectations-cg-er2007-2dsgrid.cxx → dune/gdt/test/linearelliptic/eocexpectations-cg-er2007-2dsgrid.cxx

@@ -13,7 +13,7 @@
 
 namespace Dune {
 namespace GDT {
-namespace Tests {
+namespace Test {
 
 
 template <bool anything>
@@ -41,6 +41,6 @@ template class LinearEllipticEocExpectations<LinearElliptic::ER2007TestCase<SGri
                                              LinearElliptic::ChooseDiscretizer::cg, 1>;
 
 
-} // namespace Tests
+} // namespace Test
 } // namespace GDT
 } // namespace Dune

dune/gdt/tests/linearelliptic/eocexpectations-cg-esv2007-2dalugrid.cxx → dune/gdt/test/linearelliptic/eocexpectations-cg-esv2007-2dalugrid.cxx

@@ -15,7 +15,7 @@
 
 namespace Dune {
 namespace GDT {
-namespace Tests {
+namespace Test {
 
 
 template <bool anything>
@@ -67,7 +67,7 @@ template class LinearEllipticEocExpectations<LinearElliptic::ESV2007TestCase<ALU
                                              LinearElliptic::ChooseDiscretizer::cg, 1>;
 
 
-} // namespace Tests
+} // namespace Test
 } // namespace GDT
 } // namespace Dune
 

dune/gdt/tests/linearelliptic/eocexpectations-cg-esv2007-2dsgrid.cxx → dune/gdt/test/linearelliptic/eocexpectations-cg-esv2007-2dsgrid.cxx

@@ -13,7 +13,7 @@
 
 namespace Dune {
 namespace GDT {
-namespace Tests {
+namespace Test {
 
 
 template <bool anything>
@@ -41,6 +41,6 @@ template class LinearEllipticEocExpectations<LinearElliptic::ESV2007TestCase<SGr
                                              LinearElliptic::ChooseDiscretizer::cg, 1>;
 
 
-} // namespace Tests
+} // namespace Test
 } // namespace GDT
 } // namespace Dune

dune/gdt/tests/linearelliptic/eocexpectations-cg-mixedboundary-2dalugrid.cxx → dune/gdt/test/linearelliptic/eocexpectations-cg-mixedboundary-2dalugrid.cxx

@@ -15,7 +15,7 @@
 
 namespace Dune {
 namespace GDT {
-namespace Tests {
+namespace Test {
 
 
 template <bool anything>
@@ -82,7 +82,7 @@ template class LinearEllipticEocExpectations<LinearElliptic::MixedBoundaryTestCa
                                              LinearElliptic::ChooseDiscretizer::cg, 1>;
 
 
-} // namespace Tests
+} // namespace Test
 } // namespace GDT
 } // namespace Dune
 

dune/gdt/tests/linearelliptic/eocexpectations-cg-mixedboundary-2dsgrid.cxx → dune/gdt/test/linearelliptic/eocexpectations-cg-mixedboundary-2dsgrid.cxx

@@ -13,7 +13,7 @@
 
 namespace Dune {
 namespace GDT {
-namespace Tests {
+namespace Test {
 
 
 template <bool anything>
@@ -47,6 +47,6 @@ template class LinearEllipticEocExpectations<LinearElliptic::MixedBoundaryTestCa
                                              LinearElliptic::ChooseDiscretizer::cg, 1>;
 
 
-} // namespace Tests
+} // namespace Test
 } // namespace GDT
 } // namespace Dune

dune/gdt/tests/linearelliptic/eocexpectations-cg-spe10-2dalugrid.cxx → dune/gdt/test/linearelliptic/eocexpectations-cg-spe10-2dalugrid.cxx

@@ -15,7 +15,7 @@
 
 namespace Dune {
 namespace GDT {
-namespace Tests {
+namespace Test {
 
 
 template <bool anything>
@@ -72,7 +72,7 @@ template class LinearEllipticEocExpectations<LinearElliptic::Spe10Model1TestCase
                                              LinearElliptic::ChooseDiscretizer::cg, 1>;
 
 
-} // namespace Tests
+} // namespace Test
 } // namespace GDT
 } // namespace Dune
 

dune/gdt/tests/linearelliptic/eocexpectations-cg-spe10-2dsgrid.cxx → dune/gdt/test/linearelliptic/eocexpectations-cg-spe10-2dsgrid.cxx

@@ -13,7 +13,7 @@
 
 namespace Dune {
 namespace GDT {
-namespace Tests {
+namespace Test {
 
 
 template <bool anything>
@@ -43,6 +43,6 @@ template class LinearEllipticEocExpectations<LinearElliptic::Spe10Model1TestCase
                                              LinearElliptic::ChooseDiscretizer::cg, 1>;
 
 
-} // namespace Tests
+} // namespace Test
 } // namespace GDT
 } // namespace Dune

dune/gdt/tests/linearelliptic/eocexpectations-swipdg-esv2007-2daluconform.cxx → dune/gdt/test/linearelliptic/eocexpectations-swipdg-esv2007-2daluconform.cxx

@@ -14,7 +14,7 @@
 
 namespace Dune {
 namespace GDT {
-namespace Tests {
+namespace Test {
 
 
 template <bool anything>
@@ -59,6 +59,6 @@ public:
 }; // LinearEllipticEocExpectations
 
 
-} // namespace Tests
+} // namespace Test
 } // namespace GDT
 } // namespace Dune