From 86a227ee1b7cae68dfbe5737bf3193a8f03eb138 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Sun, 11 Mar 2018 23:47:40 +0100 Subject: [PATCH] CONF inclusion test: Add VMS specific tests We want to see that VMS syntax paths are treated correctly. Reviewed-by: Tim Hudson (Merged from https://github.com/openssl/openssl/pull/5587) --- test/recipes/90-test_includes.t | 10 +++++++++- .../90-test_includes_data/vms-includes-file.cnf | 5 +++++ test/recipes/90-test_includes_data/vms-includes.cnf | 5 +++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 test/recipes/90-test_includes_data/vms-includes-file.cnf create mode 100644 test/recipes/90-test_includes_data/vms-includes.cnf diff --git a/test/recipes/90-test_includes.t b/test/recipes/90-test_includes.t index 9cf75a1c43..5169700c4c 100644 --- a/test/recipes/90-test_includes.t +++ b/test/recipes/90-test_includes.t @@ -10,8 +10,16 @@ setup("test_includes"); plan skip_all => "test_includes doesn't work without posix-io" if disabled("posix-io"); -plan tests => 3; # The number of tests being performed +plan tests => # The number of tests being performed + 3 + + ($^O eq "VMS" ? 2 : 0); ok(run(test(["conf_include_test", data_file("includes.cnf")])), "test directory includes"); ok(run(test(["conf_include_test", data_file("includes-file.cnf")])), "test file includes"); +if ($^O eq "VMS") { + ok(run(test(["conf_include_test", data_file("vms-includes.cnf")])), + "test directory includes, VMS syntax"); + ok(run(test(["conf_include_test", data_file("vms-includes-file.cnf")])), + "test file includes, VMS syntax"); +} ok(run(test(["conf_include_test", data_file("includes-broken.cnf"), "f"])), "test broken includes"); diff --git a/test/recipes/90-test_includes_data/vms-includes-file.cnf b/test/recipes/90-test_includes_data/vms-includes-file.cnf new file mode 100644 index 0000000000..f3b72e709a --- /dev/null +++ b/test/recipes/90-test_includes_data/vms-includes-file.cnf @@ -0,0 +1,5 @@ +# +# Example configuration file using includes. +# + +.include vms-includes.cnf diff --git a/test/recipes/90-test_includes_data/vms-includes.cnf b/test/recipes/90-test_includes_data/vms-includes.cnf new file mode 100644 index 0000000000..ed4367bcf0 --- /dev/null +++ b/test/recipes/90-test_includes_data/vms-includes.cnf @@ -0,0 +1,5 @@ +# +# Example configuration file using includes. +# + +.include [.conf-includes] -- 2.34.1