]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Fix path_search test.
authorBruno Turcksin <bruno.turcksin@gmail.com>
Thu, 19 Sep 2013 21:32:05 +0000 (21:32 +0000)
committerBruno Turcksin <bruno.turcksin@gmail.com>
Thu, 19 Sep 2013 21:32:05 +0000 (21:32 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30855 0785d39b-7218-0410-832d-ea1e28bc413d

tests/base/path_search.cc
tests/base/path_search.output

index bd0d6bb4d2b1ae5929ff3373d63b492f029f17c0..406e4411faa1e135d9d649a02db8704c002e1e72 100644 (file)
 #include <deal.II/base/path_search.h>
 #include <deal.II/base/logstream.h>
 
+#include <string>
+
 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;
index fda4b157f393bdc6a05e52235c18f6580291b5a0..9beddd6a58b38a42534a14e5448c2b00837bb601 100644 (file)
@@ -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

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.