From: Bruno Turcksin Date: Thu, 19 Sep 2013 21:32:05 +0000 (+0000) Subject: Fix path_search test. X-Git-Tag: v8.1.0~570^2~245 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33e9a75aa43d525b30570f232d770ff3749b8e47;p=dealii.git Fix path_search test. git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30855 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/base/path_search.cc b/tests/base/path_search.cc index bd0d6bb4d2..406e4411fa 100644 --- a/tests/base/path_search.cc +++ b/tests/base/path_search.cc @@ -19,9 +19,15 @@ #include #include +#include + int main() { - std::ofstream logfile("output"); + char tmp[1000]; + getcwd(tmp,1000); + std::string path(tmp); + chdir(SOURCE_DIR); + std::ofstream logfile(path+"/output"); deallog.attach(logfile); deallog.depth_console(0); deallog.threshold_double(1.e-10); @@ -30,9 +36,8 @@ int main() // Open with full debugging PathSearch cc("CC", 3); - cc.add_path(SOURCE_DIR "/"); - cc.add_path(SOURCE_DIR "/../"); - cc.add_path(SOURCE_DIR "/../scripts/", PathSearch::front); + cc.add_path("../"); + cc.add_path("../scripts/", PathSearch::front); cc.add_suffix(".c"); cc.add_suffix(".cc"); @@ -43,7 +48,7 @@ int main() cc.show(deallog); PathSearch mesh("MESH", 3); - mesh.add_path(SOURCE_DIR "/../bits/"); + mesh.add_path("../bits/"); mesh.show(deallog); std::ifstream in(mesh.find("grid_in_msh_01.2d").c_str()); std::string line; diff --git a/tests/base/path_search.output b/tests/base/path_search.output index fda4b157f3..9beddd6a58 100644 --- a/tests/base/path_search.output +++ b/tests/base/path_search.output @@ -9,8 +9,16 @@ DEAL::PathSearch[CC] 3 directories 3 suffixes DEAL::PathSearch[CC] 3 directories DEAL::PathSearch[CC] trying ../scripts/path_search DEAL::PathSearch[CC] trying path_search -DEAL::PathSearch[CC] opened path_search -DEAL::path_search +DEAL::PathSearch[CC] trying ../path_search +DEAL::PathSearch[CC] 3 directories +DEAL::PathSearch[CC] trying ../scripts/path_search.c +DEAL::PathSearch[CC] trying path_search.c +DEAL::PathSearch[CC] trying ../path_search.c +DEAL::PathSearch[CC] 3 directories +DEAL::PathSearch[CC] trying ../scripts/path_search.cc +DEAL::PathSearch[CC] trying path_search.cc +DEAL::PathSearch[CC] opened path_search.cc +DEAL::path_search.cc DEAL::PathSearch[CC] 3 directories 4 suffixes DEAL::PathSearch[CC] 3 directories DEAL::PathSearch[CC] trying ../scripts/tests