CMake: adjust parameter_handler/* tests

diff --git a/tests/parameter_handler/parameter_handler_16.cc b/tests/parameter_handler/parameter_handler_16.cc
index 90d4c84fb7444f25ffa021df5cda91e989ef61d5..05797e8efe3469afae140622f0bd435b14645e6c 100644 (file)
--- a/tests/parameter_handler/parameter_handler_16.cc
+++ b/tests/parameter_handler/parameter_handler_16.cc
@@ -35,7 +35,7 @@ test()
   foo.leave_subsection();
   foo.declare_entry("val2", "2.0", dealii::Patterns::Double(), "");
 
-  foo.parse_input(SOURCE_DIR "/parameter_handler_16.prm");
+  foo.parse_input(SOURCE_DIR "/parameter_handler_16_in.prm");
 
 
 

diff --git a/tests/parameter_handler/parameter_handler_16.prm b/tests/parameter_handler/parameter_handler_16_in.prm
similarity index 100%
rename from tests/parameter_handler/parameter_handler_16.prm
rename to tests/parameter_handler/parameter_handler_16_in.prm

diff --git a/tests/parameter_handler/parameter_handler_18.cc b/tests/parameter_handler/parameter_handler_18.cc
index bc3c0db7a6448a1838a5bc84223b9e23abd09731..a2034fc45d0b4f6560a0f0abcb1785363be8a5b2 100644 (file)
--- a/tests/parameter_handler/parameter_handler_18.cc
+++ b/tests/parameter_handler/parameter_handler_18.cc
@@ -34,7 +34,7 @@ test()
   foo.declare_entry("val", "1.0", dealii::Patterns::Double(), "");
   foo.leave_subsection();
 
-  foo.parse_input(SOURCE_DIR "/parameter_handler_18.prm");
+  foo.parse_input(SOURCE_DIR "/parameter_handler_18_in.prm");
 
   foo.enter_subsection("bar");
   deallog << foo.get("val") << std::endl;

diff --git a/tests/parameter_handler/parameter_handler_18.prm b/tests/parameter_handler/parameter_handler_18_in.prm
similarity index 100%
rename from tests/parameter_handler/parameter_handler_18.prm
rename to tests/parameter_handler/parameter_handler_18_in.prm

diff --git a/tests/parameter_handler/parameter_handler_1_include.cc b/tests/parameter_handler/parameter_handler_1_include.cc
index 1dd1ef9ae5ca3b8efde789ac2957e406233081d2..a897c13173995e778b5ab14d82f8e02e46dfe2e4 100644 (file)
--- a/tests/parameter_handler/parameter_handler_1_include.cc
+++ b/tests/parameter_handler/parameter_handler_1_include.cc
@@ -45,7 +45,7 @@ main()
   // is necessary so that we can include files there
   const int chdir_return_code = chdir(SOURCE_DIR);
   AssertThrow(chdir_return_code == 0, ExcInternalError());
-  check("parameter_handler_1_include.prm");
+  check("parameter_handler_1_include_in.prm");
 
   return 0;
 }

diff --git a/tests/parameter_handler/parameter_handler_1_include.prm b/tests/parameter_handler/parameter_handler_1_include.prm
deleted file mode 100644 (file)
index a2de6a5..0000000
--- a/tests/parameter_handler/parameter_handler_1_include.prm
+++ /dev/null
@@ -1,2 +0,0 @@
-set test_1 = 1,1,1
-include parameter_handler_1_include.prm2

diff --git a/tests/parameter_handler/parameter_handler_1_include_fail.cc b/tests/parameter_handler/parameter_handler_1_include_fail.cc
index 6b9f837d28d1122656a3ef47da77b74019b3c1ef..3bb55df4f67f393443d91ecb8556ad27f1f43724 100644 (file)
--- a/tests/parameter_handler/parameter_handler_1_include_fail.cc
+++ b/tests/parameter_handler/parameter_handler_1_include_fail.cc
@@ -56,7 +56,7 @@ main()
   // is necessary so that we can include files there
   const int chdir_return_code = chdir(SOURCE_DIR);
   AssertThrow(chdir_return_code == 0, ExcInternalError());
-  check("parameter_handler_1_include_fail.prm");
+  check("parameter_handler_1_include_fail_in.prm");
 
   return 0;
 }

diff --git a/tests/parameter_handler/parameter_handler_1_include_fail.output b/tests/parameter_handler/parameter_handler_1_include_fail.output
index 35e447822615ddab6a0cb0a924abdc8cafb447c9..7b6d0a634274499a893a89e5d708e0b441425642 100644 (file)
--- a/tests/parameter_handler/parameter_handler_1_include_fail.output
+++ b/tests/parameter_handler/parameter_handler_1_include_fail.output
@@ -1,4 +1,4 @@
 
 DEAL::ExcCannotOpenIncludeStatementFile (current_line_n, input_filename, line)
-Line <4> of file <input file>: This line contains an 'include' or 'INCLUDE' statement, but the given file to include <parameter_handler_1_include_fail.prm2> cannot be opened.
+Line <4> of file <input file>: This line contains an 'include' or 'INCLUDE' statement, but the given file to include <parameter_handler_1_include_fail_in.prm2> cannot be opened.
 DEAL::test_1=1,1,1

diff --git a/tests/parameter_handler/parameter_handler_1_include_fail.prm b/tests/parameter_handler/parameter_handler_1_include_fail_in.prm
similarity index 53%
rename from tests/parameter_handler/parameter_handler_1_include_fail.prm
rename to tests/parameter_handler/parameter_handler_1_include_fail_in.prm
index e3ee532211f8da5f56b2996b6782cea858a4225a..b2191d3621fde4d19d3dd61fc03c9d0cc620f1b3 100644 (file)
--- a/tests/parameter_handler/parameter_handler_1_include_fail.prm
+++ b/tests/parameter_handler/parameter_handler_1_include_fail_in.prm
@@ -1,4 +1,4 @@
 set test_1 = 1,1,1
 
 # the following file does not exist
-include parameter_handler_1_include_fail.prm2
+include parameter_handler_1_include_fail_in.prm2

diff --git a/tests/parameter_handler/parameter_handler_1_include_in.prm b/tests/parameter_handler/parameter_handler_1_include_in.prm
new file mode 100644 (file)
index 0000000..c757980
--- /dev/null
+++ b/tests/parameter_handler/parameter_handler_1_include_in.prm
@@ -0,0 +1,2 @@
+set test_1 = 1,1,1
+include parameter_handler_1_include_in.prm2

diff --git a/tests/parameter_handler/parameter_handler_1_include.prm2 b/tests/parameter_handler/parameter_handler_1_include_in.prm2
similarity index 100%
rename from tests/parameter_handler/parameter_handler_1_include.prm2
rename to tests/parameter_handler/parameter_handler_1_include_in.prm2

diff --git a/tests/parameter_handler/parameter_handler_22_last_line.cc b/tests/parameter_handler/parameter_handler_22_last_line.cc
index ceae8f2c39f842ba2a3c7eb2376299092d0d6e19..0792bc1b02c49e058ec8781a23bd4a953d39091e 100644 (file)
--- a/tests/parameter_handler/parameter_handler_22_last_line.cc
+++ b/tests/parameter_handler/parameter_handler_22_last_line.cc
@@ -46,8 +46,8 @@ main()
   // is necessary so that we can include files there
   const int chdir_return_code = chdir(SOURCE_DIR);
   AssertThrow(chdir_return_code == 0, ExcInternalError());
-  check("parameter_handler_22_last_line.prm", "");
-  check("parameter_handler_22_last_line.prm", "# end-of-parameter-section");
+  check("parameter_handler_22_last_line_in.prm", "");
+  check("parameter_handler_22_last_line_in.prm", "# end-of-parameter-section");
 
   return 0;
 }

diff --git a/tests/parameter_handler/parameter_handler_22_last_line.prm b/tests/parameter_handler/parameter_handler_22_last_line_in.prm
similarity index 100%
rename from tests/parameter_handler/parameter_handler_22_last_line.prm
rename to tests/parameter_handler/parameter_handler_22_last_line_in.prm

diff --git a/tests/parameter_handler/parameter_handler_24.cc b/tests/parameter_handler/parameter_handler_24.cc
index d693103a51d3bc7ca9463eb0fb6c2cbabb352291..ce3a8e8f049492b631709c1fcc5346f560b61295 100644 (file)
--- a/tests/parameter_handler/parameter_handler_24.cc
+++ b/tests/parameter_handler/parameter_handler_24.cc
@@ -31,7 +31,7 @@ check()
 
   prm.declare_entry("Dimension", "1", Patterns::Integer(1, 3));
 
-  std::ifstream in(SOURCE_DIR "/parameter_handler_24.prm");
+  std::ifstream in(SOURCE_DIR "/parameter_handler_24_in.prm");
   prm.parse_input(in, "input file", "", true);
 
   prm.print_parameters(deallog.get_file_stream(), ParameterHandler::Text);

diff --git a/tests/parameter_handler/parameter_handler_24.prm b/tests/parameter_handler/parameter_handler_24_in.prm
similarity index 100%
rename from tests/parameter_handler/parameter_handler_24.prm
rename to tests/parameter_handler/parameter_handler_24_in.prm