Get the SOURCE_DIR right

git-svn-id: https://svn.dealii.org/branches/branch_port_the_testsuite@30383 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 182472015f6e7d9102ec6918f454386c7f5c08ed..babe0bf63d607cecf1aceed2ef92266726582e73 100644 (file)
--- a/deal.II/cmake/macros/macro_deal_ii_add_test.cmake
+++ b/deal.II/cmake/macros/macro_deal_ii_add_test.cmake
@@ -70,7 +70,7 @@ MACRO(DEAL_II_ADD_TEST _category _test_name)
         )
       SET_PROPERTY(TARGET ${_test} APPEND PROPERTY
         COMPILE_DEFINITIONS
-          SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}
+          SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}"
         )
       TARGET_LINK_LIBRARIES(${_test_name}.${_build_lowercase}
         ${DEAL_II_BASE_NAME}${DEAL_II_${_build}_SUFFIX}

diff --git a/tests/codim_one/bem.cc b/tests/codim_one/bem.cc
index d020a959b437a34e44dc490bd43059d1467a5aef..2a5a8b6beff2407c7e06d6b2defa7b827cd799fb 100644 (file)
--- a/tests/codim_one/bem.cc
+++ b/tests/codim_one/bem.cc
@@ -126,7 +126,7 @@ BEM<spacedim>::run()
     {
 
 
-      read_grid("SOURCE_DIR/grids/circle_R10.inp");
+      read_grid(SOURCE_DIR "/grids/circle_R10.inp");
 
       Point<spacedim> p;
       HyperBallBoundary<spacedim-1, spacedim> boundary(p,10.);

diff --git a/tests/codim_one/data_out.cc b/tests/codim_one/data_out.cc
index dfb06699ccf6a48f9be432310c3c3c2077b6102a..94ad28ef19f4939a99ab2da2d4e23ac1a073ff1a 100644 (file)
--- a/tests/codim_one/data_out.cc
+++ b/tests/codim_one/data_out.cc
@@ -80,10 +80,10 @@ int main ()
   deallog.attach(logfile);
   deallog.depth_console(0);
   deallog << "Test<1,2>" << std::endl;
-  test<1,2>("SOURCE_DIR/grids/circle_2.inp");
+  test<1,2>(SOURCE_DIR "/grids/circle_2.inp");
 
   deallog << "Test<2,3>" << std::endl;
-  test<2,3>("SOURCE_DIR/grids/sphere_2.inp");
+  test<2,3>(SOURCE_DIR "/grids/sphere_2.inp");
 
   return 0;
 }

diff --git a/tests/codim_one/data_out_02.cc b/tests/codim_one/data_out_02.cc
index 8225f5615f632ba18b57ba2c87fe9950ff6d674b..cde3b641340abef5d4ac3344fce84b8a8536233f 100644 (file)
--- a/tests/codim_one/data_out_02.cc
+++ b/tests/codim_one/data_out_02.cc
@@ -53,7 +53,7 @@ int main ()
 
   GridIn<dim,dim+1> grid_in;
   grid_in.attach_triangulation (triangulation);
-  std::ifstream fname("square.msh");
+  std::ifstream fname("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 f8fe854ac7dbd00a439c94d255cb44da18094c88..2a894accb8dd288f2400afc0aeea931e99a31278 100644 (file)
--- 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<dim,dim+1> grid_in;
   grid_in.attach_triangulation (triangulation);
-  std::ifstream fname("data_out_02/square.msh");
+  std::ifstream fname("grids/square.msh");
   grid_in.read_msh (fname);
 
   dof_handler.distribute_dofs (fe);

diff --git a/tests/codim_one/gradients.cc b/tests/codim_one/gradients.cc
index 8d100fdd68723b3328268e486333ee1909c2e1dc..693d46091dd16b991730f9a27fc4efeb56d75c66 100644 (file)
--- a/tests/codim_one/gradients.cc
+++ b/tests/codim_one/gradients.cc
@@ -206,16 +206,16 @@ int main ()
   deallog.threshold_double(1.e-12);
 
   deallog<<"Test <1,2>"<<std::endl;
-  test<1,2>("SOURCE_DIR/grids/circle_4.inp");
+  test<1,2>(SOURCE_DIR "/grids/circle_4.inp");
 
   deallog<<std::endl;
 
   deallog<<"Test <2,3>"<<std::endl;
-  test<2,3>("SOURCE_DIR/grids/sphere_1.inp");
+  test<2,3>(SOURCE_DIR "/grids/sphere_1.inp");
 
-//     test<2,3>("SOURCE_DIR/grids/sphere_2.inp");
-//     test<2,3>("SOURCE_DIR/grids/sphere_3.inp");
-//     test<2,3>("SOURCE_DIR/grids/sphere_4.inp");
+//     test<2,3>(SOURCE_DIR "/grids/sphere_2.inp");
+//     test<2,3>(SOURCE_DIR "/grids/sphere_3.inp");
+//     test<2,3>(SOURCE_DIR "/grids/sphere_4.inp");
 
   return 0;
 }

diff --git a/tests/codim_one/gradients_1.cc b/tests/codim_one/gradients_1.cc
index 231c383d5c4815ca991b1c77dca41b3937bd10b9..2f1bb776ff90211bdb4352b5e93d8b9396d49f49 100644 (file)
--- a/tests/codim_one/gradients_1.cc
+++ b/tests/codim_one/gradients_1.cc
@@ -122,16 +122,16 @@ int main ()
   deallog.threshold_double(1.e-12);
 
   deallog<<"Test <1,2>, Q1, Q2, Q3"<<std::endl;
-  test<1,2>("SOURCE_DIR/grids/circle_4.inp",1);
-  test<1,2>("SOURCE_DIR/grids/circle_4.inp",2);
-  test<1,2>("SOURCE_DIR/grids/circle_4.inp",3);
+  test<1,2>(SOURCE_DIR "/grids/circle_4.inp",1);
+  test<1,2>(SOURCE_DIR "/grids/circle_4.inp",2);
+  test<1,2>(SOURCE_DIR "/grids/circle_4.inp",3);
 
   deallog<<std::endl;
 
   deallog<<"Test <2,3>, Q1, Q2, Q3"<<std::endl;
-  test<2,3>("SOURCE_DIR/grids/sphere_1.inp",1);
-  test<2,3>("SOURCE_DIR/grids/sphere_1.inp",2);
-  test<2,3>("SOURCE_DIR/grids/sphere_1.inp",3);
+  test<2,3>(SOURCE_DIR "/grids/sphere_1.inp",1);
+  test<2,3>(SOURCE_DIR "/grids/sphere_1.inp",2);
+  test<2,3>(SOURCE_DIR "/grids/sphere_1.inp",3);
 
 
   return 0;

diff --git a/tests/codim_one/grid_in_out.cc b/tests/codim_one/grid_in_out.cc
index 0692fc2d219639b3344d2fb33ebf9179a9ff4cfc..4abeca34ac3f372731aa5799c69eb0554d555796 100644 (file)
--- a/tests/codim_one/grid_in_out.cc
+++ b/tests/codim_one/grid_in_out.cc
@@ -49,9 +49,9 @@ int main ()
   deallog.attach(logfile);
   deallog.depth_console(0);
 
-  test<1,2>("SOURCE_DIR/grids/circle_1.inp");
-  test<2,3>("SOURCE_DIR/grids/square.inp");
-  test<2,3>("SOURCE_DIR/grids/sphere_1.inp");
+  test<1,2>(SOURCE_DIR "/grids/circle_1.inp");
+  test<2,3>(SOURCE_DIR "/grids/square.inp");
+  test<2,3>(SOURCE_DIR "/grids/sphere_1.inp");
 
   return 0;
 }

diff --git a/tests/codim_one/grid_in_out_02.cc b/tests/codim_one/grid_in_out_02.cc
index 95bd20e56bd6c05ac14b7bf46cb71f68558f9012..7d9af70586d92bb4c2a51a29bc3fdfb68a15f2ef 100644 (file)
--- a/tests/codim_one/grid_in_out_02.cc
+++ b/tests/codim_one/grid_in_out_02.cc
@@ -47,8 +47,8 @@ int main ()
   deallog.attach(logfile);
   deallog.depth_console(0);
 
-  test<2,3>("SOURCE_DIR/grids/square.inp");
-  test<2,3>("SOURCE_DIR/grids/sphere_1.inp");
+  test<2,3>(SOURCE_DIR "/grids/square.inp");
+  test<2,3>(SOURCE_DIR "/grids/sphere_1.inp");
 
   return 0;
 }

diff --git a/tests/codim_one/grid_in_out_03.cc b/tests/codim_one/grid_in_out_03.cc
index ef8bb1f3542fda5f41c8f5095d4d19978ebd31d9..9816190e8664d983dd4dd06d03241571c274b908 100644 (file)
--- a/tests/codim_one/grid_in_out_03.cc
+++ b/tests/codim_one/grid_in_out_03.cc
@@ -62,8 +62,8 @@ int main ()
   deallog.attach(logfile);
   deallog.depth_console(0);
 
-  test<2,3>("SOURCE_DIR/grids/square.inp");
-  test<2,3>("SOURCE_DIR/grids/sphere_1.inp");
+  test<2,3>(SOURCE_DIR "/grids/square.inp");
+  test<2,3>(SOURCE_DIR "/grids/sphere_1.inp");
 
   return 0;
 }

diff --git a/tests/codim_one/grid_refinement.cc b/tests/codim_one/grid_refinement.cc
index 19b1db0f20cbf56d191559c9163f5e07937891e5..9815e309650ca0981390bb6126f5afc1cfc64213 100644 (file)
--- a/tests/codim_one/grid_refinement.cc
+++ b/tests/codim_one/grid_refinement.cc
@@ -60,10 +60,10 @@ int main ()
   deallog.depth_console(0);
 
   deallog << "Test<1,2>" << std::endl;
-  test<1,2>("SOURCE_DIR/grids/circle_1.inp");
+  test<1,2>(SOURCE_DIR "/grids/circle_1.inp");
 
   deallog << std::endl << "Test<1,2>" << std::endl;
-  test<2,3>("SOURCE_DIR/grids/sphere_1.inp");
+  test<2,3>(SOURCE_DIR "/grids/sphere_1.inp");
 
   return 0;
 }

diff --git a/tests/codim_one/interpolate_boundary_values_01.cc b/tests/codim_one/interpolate_boundary_values_01.cc
index 9cee218c7f4be32f4c0fb30a292c3117b75e7bca..2c9e20aa6afa49767441beef01d1dac8a0a39c4c 100644 (file)
--- a/tests/codim_one/interpolate_boundary_values_01.cc
+++ b/tests/codim_one/interpolate_boundary_values_01.cc
@@ -85,8 +85,8 @@ int main ()
   deallog.attach(logfile);
   deallog.depth_console(0);
 
-  test<2,3>("SOURCE_DIR/grids/square.inp");
-  test<2,3>("SOURCE_DIR/grids/sphere_1.inp");
+  test<2,3>(SOURCE_DIR "/grids/square.inp");
+  test<2,3>(SOURCE_DIR "/grids/sphere_1.inp");
 
   return 0;
 }

diff --git a/tests/codim_one/interpolate_boundary_values_01_vector_valued.cc b/tests/codim_one/interpolate_boundary_values_01_vector_valued.cc
index 2fe3f145d61bf4085c3dd882cf77cef37d185b81..dc4aa7ee674e9321f4443c185a5d6e75722f8550 100644 (file)
--- a/tests/codim_one/interpolate_boundary_values_01_vector_valued.cc
+++ b/tests/codim_one/interpolate_boundary_values_01_vector_valued.cc
@@ -101,8 +101,8 @@ int main ()
   deallog.attach(logfile);
   deallog.depth_console(0);
 
-  test<2,3>("SOURCE_DIR/grids/square.inp");
-  test<2,3>("SOURCE_DIR/grids/sphere_1.inp");
+  test<2,3>(SOURCE_DIR "/grids/square.inp");
+  test<2,3>(SOURCE_DIR "/grids/sphere_1.inp");
 
   return 0;
 }

diff --git a/tests/codim_one/interpolation.cc b/tests/codim_one/interpolation.cc
index c90f446b462592a8883ed996051501478b8fd70a..a771ca8148054c1124958f97580afc6cfd31aac1 100644 (file)
--- a/tests/codim_one/interpolation.cc
+++ b/tests/codim_one/interpolation.cc
@@ -89,10 +89,10 @@ int main ()
   for (unsigned int n=1; n<8; ++n)
     {
       deallog << "Test<1,2>, finite element q_" << n << std::endl;
-      test<1,2>("SOURCE_DIR/grids/circle_2.inp",n);
+      test<1,2>(SOURCE_DIR "/grids/circle_2.inp",n);
 
       deallog << "Test<1,2>, finite element q_" << n << std::endl;
-      test<2,3>("SOURCE_DIR/grids/sphere_2.inp",n);
+      test<2,3>(SOURCE_DIR "/grids/sphere_2.inp",n);
     }
   return 0;
 }

diff --git a/tests/codim_one/interpolation_2.cc b/tests/codim_one/interpolation_2.cc
index b227a494844ee2081af6a71cc3aed0a4c6a2eb99..c6f93c49f6bf49f26b45cea72ae30a69d7e212d3 100644 (file)
--- a/tests/codim_one/interpolation_2.cc
+++ b/tests/codim_one/interpolation_2.cc
@@ -84,10 +84,10 @@ int main ()
   deallog.depth_console(0);
 
   deallog << "Test<1,2>" << std::endl;
-  test<1,2>("SOURCE_DIR/grids/circle_2.inp");
+  test<1,2>(SOURCE_DIR "/grids/circle_2.inp");
 
   deallog << "Test<1,2>" << std::endl;
-  test<2,3>("SOURCE_DIR/grids/sphere_2.inp");
+  test<2,3>(SOURCE_DIR "/grids/sphere_2.inp");
 
   return 0;
 }

diff --git a/tests/codim_one/interpolation_3.cc b/tests/codim_one/interpolation_3.cc
index bdda97549fd45bc9f81557ba89beb290b1b841b6..a695c20b8571de40f70cf2a1b683fa65139d433d 100644 (file)
--- a/tests/codim_one/interpolation_3.cc
+++ b/tests/codim_one/interpolation_3.cc
@@ -93,10 +93,10 @@ int main ()
   deallog.depth_console(0);
 
   deallog << "Test<1,2>" << std::endl;
-  test<1,2>("SOURCE_DIR/grids/circle_2.inp");
+  test<1,2>(SOURCE_DIR "/grids/circle_2.inp");
 
   deallog << "Test<1,2>" << std::endl;
-  test<2,3>("SOURCE_DIR/grids/sphere_2.inp");
+  test<2,3>(SOURCE_DIR "/grids/sphere_2.inp");
 
   return 0;
 }

diff --git a/tests/codim_one/mapping_q1.cc b/tests/codim_one/mapping_q1.cc
index 1c050a374c91f23250c928d57bbe092774d106c4..d218f00eb7eeeefb0f79969b62aa19f0a65c5100 100644 (file)
--- a/tests/codim_one/mapping_q1.cc
+++ b/tests/codim_one/mapping_q1.cc
@@ -78,9 +78,9 @@ int main ()
   deallog.attach(logfile);
   deallog.depth_console(0);
 
-  test<1,2>("SOURCE_DIR/grids/circle_1.inp");
-  test<2,3>("SOURCE_DIR/grids/square.inp");
-  test<2,3>("SOURCE_DIR/grids/sphere_1.inp");
+  test<1,2>(SOURCE_DIR "/grids/circle_1.inp");
+  test<2,3>(SOURCE_DIR "/grids/square.inp");
+  test<2,3>(SOURCE_DIR "/grids/sphere_1.inp");
 
   return 0;
 }

diff --git a/tests/codim_one/mapping_q1_eulerian.cc b/tests/codim_one/mapping_q1_eulerian.cc
index cf8c616de0cfd9c09a25206d77890546b97f8059..31fea594ef1110bdc413e2878b0cf96b7ed3026c 100644 (file)
--- a/tests/codim_one/mapping_q1_eulerian.cc
+++ b/tests/codim_one/mapping_q1_eulerian.cc
@@ -91,9 +91,9 @@ int main ()
   deallog.attach(logfile);
   deallog.depth_console(0);
 
-  test<1,2>("SOURCE_DIR/grids/circle_1.inp");
-  test<2,3>("SOURCE_DIR/grids/square.inp");
-  test<2,3>("SOURCE_DIR/grids/sphere_1.inp");
+  test<1,2>(SOURCE_DIR "/grids/circle_1.inp");
+  test<2,3>(SOURCE_DIR "/grids/square.inp");
+  test<2,3>(SOURCE_DIR "/grids/sphere_1.inp");
 
   return 0;
 }

diff --git a/tests/codim_one/mapping_q_eulerian.cc b/tests/codim_one/mapping_q_eulerian.cc
index 0a7df86893dea4ba1150a15aa7d650d5e52ba23a..81c20ea5f7044d66c8386d508cf58e06d2581a85 100644 (file)
--- a/tests/codim_one/mapping_q_eulerian.cc
+++ b/tests/codim_one/mapping_q_eulerian.cc
@@ -92,13 +92,13 @@ int main ()
   deallog.attach(logfile);
   deallog.depth_console(0);
 
-  test<1,2>("SOURCE_DIR/grids/circle_1.inp",1);
-  test<1,2>("SOURCE_DIR/grids/circle_1.inp",2);
-  test<2,3>("SOURCE_DIR/grids/square.inp",1);
-  test<2,3>("SOURCE_DIR/grids/square.inp",2);
-  test<2,3>("SOURCE_DIR/grids/sphere_1.inp",1);
-// test<2,3>("SOURCE_DIR/grids/problem.inp",1);
-  test<2,3>("SOURCE_DIR/grids/sphere_1.inp",2);
+  test<1,2>(SOURCE_DIR "/grids/circle_1.inp",1);
+  test<1,2>(SOURCE_DIR "/grids/circle_1.inp",2);
+  test<2,3>(SOURCE_DIR "/grids/square.inp",1);
+  test<2,3>(SOURCE_DIR "/grids/square.inp",2);
+  test<2,3>(SOURCE_DIR "/grids/sphere_1.inp",1);
+// test<2,3>(SOURCE_DIR "/grids/problem.inp",1);
+  test<2,3>(SOURCE_DIR "/grids/sphere_1.inp",2);
 
   return 0;
 }

diff --git a/tests/codim_one/projection.cc b/tests/codim_one/projection.cc
index 1f76b0c4f80c60914d61f1b31cee0836e96333c4..c2fdac3481d877ae5924ca2b5c869cae88679b6c 100644 (file)
--- a/tests/codim_one/projection.cc
+++ b/tests/codim_one/projection.cc
@@ -93,10 +93,10 @@ int main ()
   for (unsigned int n=1; n<5; n++)
     {
       deallog << "Test<1,2>, continous finite element q_" << n << std::endl;
-      test<1,2>("SOURCE_DIR/grids/circle_2.inp",n);
+      test<1,2>(SOURCE_DIR "/grids/circle_2.inp",n);
 
       deallog << "Test<2,3>, continous finite element q_" << n << std::endl;
-      test<2,3>("SOURCE_DIR/grids/sphere_2.inp",n);
+      test<2,3>(SOURCE_DIR "/grids/sphere_2.inp",n);
     }
   return 0;
 }

diff --git a/tests/codim_one/projection_dgp.cc b/tests/codim_one/projection_dgp.cc
index 7e5c353e99cc9b7f20bb238a0ef5faee8957fe88..8c571b9c873f745c60fc0544d968099a262cdc95 100644 (file)
--- a/tests/codim_one/projection_dgp.cc
+++ b/tests/codim_one/projection_dgp.cc
@@ -94,10 +94,10 @@ int main ()
   for (unsigned int n=1; n<5; n++)
     {
       deallog << "Test<1,2>, continous finite element q_" << n << std::endl;
-      test<1,2>("SOURCE_DIR/grids/circle_2.inp",n);
+      test<1,2>(SOURCE_DIR "/grids/circle_2.inp",n);
 
       deallog << "Test<2,3>, continous finite element q_" << n << std::endl;
-      test<2,3>("SOURCE_DIR/grids/sphere_2.inp",n);
+      test<2,3>(SOURCE_DIR "/grids/sphere_2.inp",n);
     }
   return 0;
 }

diff --git a/tests/codim_one/renumber_component_wise_01.cc b/tests/codim_one/renumber_component_wise_01.cc
index eb932e0710f4feffbad0ffe595e1dd5fb31b922e..c4798b00bf918397a4e2f9768afd3b9163bb89e4 100644 (file)
--- a/tests/codim_one/renumber_component_wise_01.cc
+++ b/tests/codim_one/renumber_component_wise_01.cc
@@ -71,8 +71,8 @@ int main ()
   deallog.attach(logfile);
   deallog.depth_console(0);
 
-  test<2,3>("SOURCE_DIR/grids/square.inp");
-  test<2,3>("SOURCE_DIR/grids/sphere_1.inp");
+  test<2,3>(SOURCE_DIR "/grids/square.inp");
+  test<2,3>(SOURCE_DIR "/grids/sphere_1.inp");
 
   return 0;
 }

diff --git a/tests/codim_one/surface.cc b/tests/codim_one/surface.cc
index e04e303557589cdde002556a76242d1f30af9ba2..79125a0932a8e48a7f1cfccc979b995bbc4eb3c5 100644 (file)
--- a/tests/codim_one/surface.cc
+++ b/tests/codim_one/surface.cc
@@ -105,16 +105,16 @@ int main ()
   deallog.depth_console(0);
 
   deallog<<"Test <1,2>"<<std::endl;
-  test<1,2>("SOURCE_DIR/grids/circle_1.inp");
-  test<1,2>("SOURCE_DIR/grids/circle_2.inp");
-  test<1,2>("SOURCE_DIR/grids/circle_3.inp");
-  test<1,2>("SOURCE_DIR/grids/circle_4.inp");
+  test<1,2>(SOURCE_DIR "/grids/circle_1.inp");
+  test<1,2>(SOURCE_DIR "/grids/circle_2.inp");
+  test<1,2>(SOURCE_DIR "/grids/circle_3.inp");
+  test<1,2>(SOURCE_DIR "/grids/circle_4.inp");
 
   deallog<<"Test <2,3>"<<std::endl;
-  test<2,3>("SOURCE_DIR/grids/sphere_1.inp");
-  test<2,3>("SOURCE_DIR/grids/sphere_2.inp");
-  test<2,3>("SOURCE_DIR/grids/sphere_3.inp");
-  test<2,3>("SOURCE_DIR/grids/sphere_4.inp");
+  test<2,3>(SOURCE_DIR "/grids/sphere_1.inp");
+  test<2,3>(SOURCE_DIR "/grids/sphere_2.inp");
+  test<2,3>(SOURCE_DIR "/grids/sphere_3.inp");
+  test<2,3>(SOURCE_DIR "/grids/sphere_4.inp");
 
   return 0;
 }