From: Matthias Maier Date: Tue, 15 Feb 2022 16:28:57 +0000 (-0600) Subject: CMake: adjust parameter_handler/* tests X-Git-Tag: v9.4.0-rc1~473^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fe17c41ef700c45a66bcc56f81612b5ab256a82;p=dealii.git CMake: adjust parameter_handler/* tests --- diff --git a/tests/parameter_handler/parameter_handler_16.cc b/tests/parameter_handler/parameter_handler_16.cc index 90d4c84fb7..05797e8efe 100644 --- 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 bc3c0db7a6..a2034fc45d 100644 --- 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 1dd1ef9ae5..a897c13173 100644 --- 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 index a2de6a5225..0000000000 --- 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 6b9f837d28..3bb55df4f6 100644 --- 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 35e4478226..7b6d0a6342 100644 --- 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 : This line contains an 'include' or 'INCLUDE' statement, but the given file to include cannot be opened. +Line <4> of file : This line contains an 'include' or 'INCLUDE' statement, but the given file to include 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 e3ee532211..b2191d3621 100644 --- 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 index 0000000000..c757980754 --- /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 ceae8f2c39..0792bc1b02 100644 --- 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 d693103a51..ce3a8e8f04 100644 --- 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