]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
testutil/init.c rename to testutil/testutil_init.c
authorPatrick Steuer <patrick.steuer@de.ibm.com>
Wed, 13 Nov 2019 17:39:51 +0000 (18:39 +0100)
committerPatrick Steuer <patrick.steuer@de.ibm.com>
Thu, 14 Nov 2019 19:48:27 +0000 (20:48 +0100)
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

test/build.info
test/testutil/testutil_init.c [moved from test/testutil/init.c with 100% similarity]

index db28dd97f7ac1f937caed190f582c8e66a70e445..9b57edf518667b5c84be651b52b1c40bf915387d 100644 (file)
@@ -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