fix test

git-svn-id: https://svn.dealii.org/trunk@28896 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/tests/base/path_search.cc b/tests/base/path_search.cc
index b87b123ad6f72889ab62490c1a1ee62920c35719..4db5fe1f138987cad2c64ee041fc121b62f32622 100644 (file)
--- a/tests/base/path_search.cc
+++ b/tests/base/path_search.cc
@@ -26,21 +26,21 @@ int main()
 
                                   // Open with full debugging
   PathSearch cc("CC", 3);
-  cc.add_path(DEAL_II_PATH "/source/lac/");
-  cc.add_path(DEAL_II_PATH "/include/deal.II/lac/", PathSearch::front);
+  cc.add_path("../");
+  cc.add_path("../scripts/", PathSearch::front);
   cc.add_suffix(".c");
   cc.add_suffix(".cc");
 
-  deallog << cc.find("block_vector.cc") << std::endl;
-  deallog << cc.find("block_vector") << std::endl;
+  deallog << cc.find("path_search.cc") << std::endl;
+  deallog << cc.find("path_search") << std::endl;
   cc.add_suffix(".h", PathSearch::after_none);
-  deallog << cc.find("block_vector") << std::endl;
+  deallog << cc.find("tests") << std::endl;
   cc.show(deallog);
   
   PathSearch mesh("MESH", 3);
+  mesh.add_path("../bits/");
   mesh.show(deallog);
-  std::ifstream in(mesh.find("backstep").c_str());
-  deallog << mesh.find("backstep") << std::endl;
+  std::ifstream in(mesh.find("grid_in_msh_01.2d").c_str());
   std::string line;
   for (unsigned int i=0;i<4;++i)
     {

diff --git a/tests/base/path_search/cmp/generic b/tests/base/path_search/cmp/generic
index b909917f693f2e4ceadb8a5aec33cb88a3ae3211..fda4b157f393bdc6a05e52235c18f6580291b5a0 100644 (file)
--- a/tests/base/path_search/cmp/generic
+++ b/tests/base/path_search/cmp/generic
@@ -1,54 +1,55 @@
 
 DEAL::PathSearch[CC] 3 directories 3 suffixes
 DEAL::PathSearch[CC] 3 directories 
-DEAL::PathSearch[CC] trying DEAL_II_PATH/include/deal.II/lac/block_vector.cc
-DEAL::PathSearch[CC] trying block_vector.cc
-DEAL::PathSearch[CC] trying DEAL_II_PATH/source/lac/block_vector.cc
-DEAL::PathSearch[CC] opened DEAL_II_PATH/source/lac/block_vector.cc
-DEAL::DEAL_II_PATH/source/lac/block_vector.cc
+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 3 suffixes
 DEAL::PathSearch[CC] 3 directories 
-DEAL::PathSearch[CC] trying DEAL_II_PATH/include/deal.II/lac/block_vector
-DEAL::PathSearch[CC] trying block_vector
-DEAL::PathSearch[CC] trying DEAL_II_PATH/source/lac/block_vector
-DEAL::PathSearch[CC] 3 directories 
-DEAL::PathSearch[CC] trying DEAL_II_PATH/include/deal.II/lac/block_vector.c
-DEAL::PathSearch[CC] trying block_vector.c
-DEAL::PathSearch[CC] trying DEAL_II_PATH/source/lac/block_vector.c
-DEAL::PathSearch[CC] 3 directories 
-DEAL::PathSearch[CC] trying DEAL_II_PATH/include/deal.II/lac/block_vector.cc
-DEAL::PathSearch[CC] trying block_vector.cc
-DEAL::PathSearch[CC] trying DEAL_II_PATH/source/lac/block_vector.cc
-DEAL::PathSearch[CC] opened DEAL_II_PATH/source/lac/block_vector.cc
-DEAL::DEAL_II_PATH/source/lac/block_vector.cc
+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] 3 directories 4 suffixes
 DEAL::PathSearch[CC] 3 directories 
-DEAL::PathSearch[CC] trying DEAL_II_PATH/include/deal.II/lac/block_vector
-DEAL::PathSearch[CC] trying block_vector
-DEAL::PathSearch[CC] trying DEAL_II_PATH/source/lac/block_vector
+DEAL::PathSearch[CC] trying ../scripts/tests
+DEAL::PathSearch[CC] trying tests
+DEAL::PathSearch[CC] trying ../tests
 DEAL::PathSearch[CC] 3 directories 
-DEAL::PathSearch[CC] trying DEAL_II_PATH/include/deal.II/lac/block_vector.h
-DEAL::PathSearch[CC] opened DEAL_II_PATH/include/deal.II/lac/block_vector.h
-DEAL::DEAL_II_PATH/include/deal.II/lac/block_vector.h
-DEAL::DEAL_II_CCPATH="DEAL_II_PATH/include/deal.II/lac/::DEAL_II_PATH/source/lac/"
+DEAL::PathSearch[CC] trying ../scripts/tests.h
+DEAL::PathSearch[CC] trying tests.h
+DEAL::PathSearch[CC] trying ../tests.h
+DEAL::PathSearch[CC] opened ../tests.h
+DEAL::../tests.h
+DEAL::DEAL_II_CCPATH="../scripts/::../"
 DEAL:: Suffixes "" ".h" ".c" ".cc"
-DEAL::DEAL_II_MESHPATH=":DEAL_II_PATH/lib/meshes/"
+DEAL::DEAL_II_MESHPATH=":../bits/"
 DEAL:: Suffixes "" ".inp" ".xda" ".dbmesh" ".dat" ".plt" ".nc" ".msh"
 DEAL::PathSearch[MESH] 2 directories 8 suffixes
 DEAL::PathSearch[MESH] 2 directories 
-DEAL::PathSearch[MESH] trying backstep
-DEAL::PathSearch[MESH] trying DEAL_II_PATH/lib/meshes/backstep
+DEAL::PathSearch[MESH] trying grid_in_msh_01.2d
+DEAL::PathSearch[MESH] trying ../bits/grid_in_msh_01.2d
 DEAL::PathSearch[MESH] 2 directories 
-DEAL::PathSearch[MESH] trying backstep.inp
-DEAL::PathSearch[MESH] trying DEAL_II_PATH/lib/meshes/backstep.inp
-DEAL::PathSearch[MESH] opened DEAL_II_PATH/lib/meshes/backstep.inp
-DEAL::PathSearch[MESH] 2 directories 8 suffixes
+DEAL::PathSearch[MESH] trying grid_in_msh_01.2d.inp
+DEAL::PathSearch[MESH] trying ../bits/grid_in_msh_01.2d.inp
+DEAL::PathSearch[MESH] 2 directories 
+DEAL::PathSearch[MESH] trying grid_in_msh_01.2d.xda
+DEAL::PathSearch[MESH] trying ../bits/grid_in_msh_01.2d.xda
+DEAL::PathSearch[MESH] 2 directories 
+DEAL::PathSearch[MESH] trying grid_in_msh_01.2d.dbmesh
+DEAL::PathSearch[MESH] trying ../bits/grid_in_msh_01.2d.dbmesh
+DEAL::PathSearch[MESH] 2 directories 
+DEAL::PathSearch[MESH] trying grid_in_msh_01.2d.dat
+DEAL::PathSearch[MESH] trying ../bits/grid_in_msh_01.2d.dat
+DEAL::PathSearch[MESH] 2 directories 
+DEAL::PathSearch[MESH] trying grid_in_msh_01.2d.plt
+DEAL::PathSearch[MESH] trying ../bits/grid_in_msh_01.2d.plt
 DEAL::PathSearch[MESH] 2 directories 
-DEAL::PathSearch[MESH] trying backstep
-DEAL::PathSearch[MESH] trying DEAL_II_PATH/lib/meshes/backstep
+DEAL::PathSearch[MESH] trying grid_in_msh_01.2d.nc
+DEAL::PathSearch[MESH] trying ../bits/grid_in_msh_01.2d.nc
 DEAL::PathSearch[MESH] 2 directories 
-DEAL::PathSearch[MESH] trying backstep.inp
-DEAL::PathSearch[MESH] trying DEAL_II_PATH/lib/meshes/backstep.inp
-DEAL::PathSearch[MESH] opened DEAL_II_PATH/lib/meshes/backstep.inp
-DEAL::DEAL_II_PATH/lib/meshes/backstep.inp
-DEAL:: # Backward facing step
+DEAL::PathSearch[MESH] trying grid_in_msh_01.2d.msh
+DEAL::PathSearch[MESH] trying ../bits/grid_in_msh_01.2d.msh
+DEAL::PathSearch[MESH] opened ../bits/grid_in_msh_01.2d.msh
+DEAL:: $NOD 4 1 0