diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-03-03 10:27:10 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-03-05 08:53:19 +0100 |
| commit | ce506d27ab5e7d17dfe3fe649768a0d19b6c86ee (patch) | |
| tree | c61515908e1be0432bf18a0fcb6709edae3ecf61 /test/build.info | |
| parent | VMS: move copy_argc to its own module and make it an aux source (diff) | |
| download | openssl-ce506d27ab5e7d17dfe3fe649768a0d19b6c86ee.tar.xz openssl-ce506d27ab5e7d17dfe3fe649768a0d19b6c86ee.zip | |
testutil: ensure good treatment of argv on non-Unix platforms
From a Unix point of view, some other platform families have certain
quirks. Windows command prompt doesn't expand globs into actual file
names, so we must do this. VMS has some oddity with argv pointer size
that can cause crashes if you're not careful (by copying it to a less
surprising pointer size array).
The fixups already exist and are used in the apps/ code. However, the
testutil code started using the opt routines from apps/ without
including the non-Unix fixups. This change fixes that.
For VMS' sake, libtestutil gets an app_malloc() shim, to avoid sucking
in all of apps/apps.c.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8381)
Diffstat (limited to 'test/build.info')
| -rw-r--r-- | test/build.info | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/test/build.info b/test/build.info index 1a474634c5..372f9be9d6 100644 --- a/test/build.info +++ b/test/build.info @@ -6,6 +6,8 @@ SUBDIRS=ossl_shim my ($base, $files) = @_; return join(" ", map { "$base/$_" } split(/\s+/, $files)); } + our $apps_aux_src = + join(' ', map { "../apps/$_" } split(/\s+/, $target{apps_aux_src})); "" -} IF[{- !$disabled{tests} -}] @@ -14,7 +16,8 @@ IF[{- !$disabled{tests} -}] testutil/driver.c testutil/tests.c testutil/cb.c testutil/stanza.c \ testutil/format_output.c testutil/tap_bio.c \ testutil/test_cleanup.c testutil/main.c testutil/init.c \ - testutil/options.c testutil/test_options.c ../apps/opt.c + testutil/options.c testutil/test_options.c \ + testutil/apps_mem.c ../apps/opt.c {- $apps_aux_src; -} INCLUDE[libtestutil.a]=../include ../apps/include .. DEPEND[libtestutil.a]=../libcrypto |