From: Matthias Maier Date: Wed, 21 Aug 2013 23:40:03 +0000 (+0000) Subject: Rename the tests to category/testname X-Git-Tag: v8.1.0~570^2~439 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d995c2394a58b7cc9c5372ca4edfb84f6e5c2b58;p=dealii.git Rename the tests to category/testname git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30396 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/cmake/macros/macro_deal_ii_add_test.cmake b/deal.II/cmake/macros/macro_deal_ii_add_test.cmake index babe0bf63d..39434867ed 100644 --- a/deal.II/cmake/macros/macro_deal_ii_add_test.cmake +++ b/deal.II/cmake/macros/macro_deal_ii_add_test.cmake @@ -112,14 +112,14 @@ MACRO(DEAL_II_ADD_TEST _category _test_name) ) - ADD_TEST(NAME ${_test} + ADD_TEST(NAME ${_category}/${_test} COMMAND ${CMAKE_COMMAND} -DTEST=${_test} -DDEAL_II_BINARY_DIR=${CMAKE_BINARY_DIR} -P ${CMAKE_SOURCE_DIR}/cmake/scripts/run_test.cmake WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${_test} ) - SET_TESTS_PROPERTIES(${_test} PROPERTIES + SET_TESTS_PROPERTIES(${_category}/${_test} PROPERTIES LABEL "${_category}" TIMEOUT ${DEAL_II_TEST_TIME_LIMIT} ) diff --git a/tests/codim_one/data_out_02.cc b/tests/codim_one/data_out_02.cc index cde3b64134..9b6a5c7618 100644 --- a/tests/codim_one/data_out_02.cc +++ b/tests/codim_one/data_out_02.cc @@ -53,7 +53,7 @@ int main () GridIn grid_in; grid_in.attach_triangulation (triangulation); - std::ifstream fname("grids/square.msh"); + std::ifstream fname(SOURCE_DIR "grids/square.msh"); grid_in.read_msh (fname); dof_handler.distribute_dofs (fe); diff --git a/tests/codim_one/fe_values_extractor_01.cc b/tests/codim_one/fe_values_extractor_01.cc index 2a894accb8..941481177a 100644 --- a/tests/codim_one/fe_values_extractor_01.cc +++ b/tests/codim_one/fe_values_extractor_01.cc @@ -57,7 +57,7 @@ int main () GridIn grid_in; grid_in.attach_triangulation (triangulation); - std::ifstream fname("grids/square.msh"); + std::ifstream fname(SOURCE_DIR "grids/square.msh"); grid_in.read_msh (fname); dof_handler.distribute_dofs (fe); diff --git a/tests/umfpack/CMakeLists.txt b/tests/umfpack/CMakeLists.txt new file mode 100644 index 0000000000..0efb828f2c --- /dev/null +++ b/tests/umfpack/CMakeLists.txt @@ -0,0 +1 @@ +DEAL_II_PICKUP_TESTS()