diff options
| author | Patrick Steuer <patrick.steuer@de.ibm.com> | 2019-11-13 18:39:51 +0100 |
|---|---|---|
| committer | Patrick Steuer <patrick.steuer@de.ibm.com> | 2019-11-14 20:48:27 +0100 |
| commit | 31c3127a94506700a045d00bfe6333cf1258db07 (patch) | |
| tree | 8cac96f264e7d5e72823f5627ec2ba3044ceb014 /test | |
| parent | 1e5565ddc20062f6bc581ed3a7825827833b8a32 (diff) | |
testutil/init.c rename to testutil/testutil_init.c
Avoid conflicts with some linkers.
Signed-off-by: Patrick Steuer <patrick.steuer@de.ibm.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10439)
(cherry picked from commit e74b5dcf16dfd7c91d9f9a7e69c447f00d778e17)
Conflicts:
test/build.info
Diffstat (limited to 'test')
| -rw-r--r-- | test/build.info | 2 | ||||
| -rw-r--r-- | test/testutil/testutil_init.c (renamed from test/testutil/init.c) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/test/build.info b/test/build.info index db28dd97f7..9b57edf518 100644 --- a/test/build.info +++ b/test/build.info @@ -12,7 +12,7 @@ IF[{- !$disabled{tests} -}] SOURCE[libtestutil.a]=testutil/basic_output.c testutil/output_helpers.c \ 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/test_cleanup.c testutil/main.c testutil/testutil_init.c \ testutil/random.c INCLUDE[libtestutil.a]=../include DEPEND[libtestutil.a]=../libcrypto diff --git a/test/testutil/init.c b/test/testutil/testutil_init.c index 5095c7f7e3..5095c7f7e3 100644 --- a/test/testutil/init.c +++ b/test/testutil/testutil_init.c |