From 30a2a169490c7171c8433fe833a090e21648cb12 Mon Sep 17 00:00:00 2001 From: turcksin Date: Wed, 18 Sep 2013 23:17:06 +0000 Subject: [PATCH] Try to fix path_search test. The problem is that with ctest, we need to do a diff on absolute path. git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30816 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/base/path_search.cc | 7 ++++--- tests/bits/grid_in_msh_01.2d.msh | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 tests/bits/grid_in_msh_01.2d.msh diff --git a/tests/base/path_search.cc b/tests/base/path_search.cc index 3e75da5c6b..bd0d6bb4d2 100644 --- a/tests/base/path_search.cc +++ b/tests/base/path_search.cc @@ -30,8 +30,9 @@ int main() // Open with full debugging PathSearch cc("CC", 3); - cc.add_path("../"); - cc.add_path("../scripts/", PathSearch::front); + cc.add_path(SOURCE_DIR "/"); + cc.add_path(SOURCE_DIR "/../"); + cc.add_path(SOURCE_DIR "/../scripts/", PathSearch::front); cc.add_suffix(".c"); cc.add_suffix(".cc"); @@ -42,7 +43,7 @@ int main() cc.show(deallog); PathSearch mesh("MESH", 3); - mesh.add_path("../bits/"); + mesh.add_path(SOURCE_DIR "/../bits/"); mesh.show(deallog); std::ifstream in(mesh.find("grid_in_msh_01.2d").c_str()); std::string line; diff --git a/tests/bits/grid_in_msh_01.2d.msh b/tests/bits/grid_in_msh_01.2d.msh new file mode 100644 index 0000000000..ef628fb294 --- /dev/null +++ b/tests/bits/grid_in_msh_01.2d.msh @@ -0,0 +1,15 @@ +$NOD +4 +1 0 0 0 +2 1 0 0 +3 1 1 0 +4 0 1 0 +$ENDNOD +$ELM +5 +1 1 1 1 2 1 2 +2 1 1 2 2 2 3 +3 1 1 3 2 3 4 +4 1 1 4 2 4 1 +5 3 100 6 4 1 2 3 4 +$ENDELM -- 2.39.5