summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorPatrick Steuer <patrick.steuer@de.ibm.com>2019-11-13 18:39:51 +0100
committerPatrick Steuer <patrick.steuer@de.ibm.com>2019-11-14 20:36:38 +0100
commite74b5dcf16dfd7c91d9f9a7e69c447f00d778e17 (patch)
treeb2d9b0c8ad4cfe4c61d8c86992a59b690b921709 /test
parenta90311fead3d8e5178637f2d284fad95a47c281c (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)
Diffstat (limited to 'test')
-rw-r--r--test/build.info2
-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 468f80dbf9..e4fff15883 100644
--- a/test/build.info
+++ b/test/build.info
@@ -21,7 +21,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/options.c testutil/test_options.c \
testutil/apps_mem.c testutil/random.c $LIBAPPSSRC
INCLUDE[libtestutil.a]=../include ../apps/include ..
diff --git a/test/testutil/init.c b/test/testutil/testutil_init.c
index 7c6041aee5..7c6041aee5 100644
--- a/test/testutil/init.c
+++ b/test/testutil/testutil_init.c