diff options
author | Richard Levitte <levitte@openssl.org> | 2017-02-18 22:41:27 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2017-02-19 10:43:51 +0100 |
commit | d89f66412ba5168e7d6fd9dd88619d927d716f55 (patch) | |
tree | 6521ba689bdb3cccc53970650803a181e2ee456e | |
parent | 7c98706e61feaf10250a7d64c8e6cec936703eb9 (diff) | |
download | openssl-d89f66412ba5168e7d6fd9dd88619d927d716f55.tar.gz |
VMS fix of test/recipes/80-test_ssl_new.t
On VMS, file names with more than one period get all but the last get
escaped with a ^, so 21-key-update.conf.in becomes 21-key-update^.conf.in
That means that %conf_dependent_tests and %skip become useless unless
we massage the file names that are used as indexes.
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2678)
-rw-r--r-- | test/recipes/80-test_ssl_new.t | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t index 71855f456f..f65b5d0559 100644 --- a/test/recipes/80-test_ssl_new.t +++ b/test/recipes/80-test_ssl_new.t @@ -24,8 +24,8 @@ $ENV{CTLOG_FILE} = srctop_file("test", "ct", "log_list.conf"); my @conf_srcs = glob(srctop_file("test", "ssl-tests", "*.conf.in")); map { s/;.*// } @conf_srcs if $^O eq "VMS"; -my @conf_files = map { basename($_) } @conf_srcs; -map { s/\.in// } @conf_files; +my @conf_files = map { basename($_, ".in") } @conf_srcs; +map { s/\^// } @conf_files if $^O eq "VMS"; # We hard-code the number of tests to double-check that the globbing above # finds all files as expected. |