diff options
| author | Rich Salz <rsalz@akamai.com> | 2021-04-30 18:18:00 +0200 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-05-05 13:11:35 +0200 |
| commit | f7050588bc76901e0a147c158e64ac3140dc8bfd (patch) | |
| tree | 76a0453a8781c5e9ed61553d9086fa0ead7a4bca /test | |
| parent | Allow absolute paths to be set (diff) | |
| download | openssl-f7050588bc76901e0a147c158e64ac3140dc8bfd.tar.xz openssl-f7050588bc76901e0a147c158e64ac3140dc8bfd.zip | |
Add .includedir pragma
Also add a negative test, and fix typo's.
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15090)
Diffstat (limited to 'test')
| -rw-r--r-- | test/recipes/90-test_includes.t | 3 | ||||
| -rw-r--r-- | test/recipes/90-test_includes_data/incdir.cnf | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/test/recipes/90-test_includes.t b/test/recipes/90-test_includes.t index add3813a64..13c5c84202 100644 --- a/test/recipes/90-test_includes.t +++ b/test/recipes/90-test_includes.t @@ -13,7 +13,7 @@ plan skip_all => "test_includes doesn't work without posix-io" delete $ENV{OPENSSL_CONF_INCLUDE}; plan tests => # The number of tests being performed - 5 + 6 + ($^O eq "VMS" ? 2 : 0); ok(run(test(["conf_include_test", data_file("includes.cnf")])), "test directory includes"); @@ -27,3 +27,4 @@ if ($^O eq "VMS") { "test file includes, VMS syntax"); } ok(run(test(["conf_include_test", "-f", data_file("includes-broken.cnf")])), "test broken includes"); +ok(run(test(["conf_include_test", "-f", data_file("incdir.cnf")])), "test includedir"); diff --git a/test/recipes/90-test_includes_data/incdir.cnf b/test/recipes/90-test_includes_data/incdir.cnf new file mode 100644 index 0000000000..0d882eddcf --- /dev/null +++ b/test/recipes/90-test_includes_data/incdir.cnf @@ -0,0 +1,6 @@ +# +# Set includedir and expect to fail +# +.pragma includedir:/ + +.include includes.cnf |