testutil: make subtest_level() internal

Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3345)

diff --git a/test/testutil.h b/test/testutil.h
index 66b9e814ee9669188b7aee92292d3ee82566887d..1826470697a7766998b73073ffc52e878ed978e4 100644 (file)
--- a/test/testutil.h
+++ b/test/testutil.h
@@ -359,5 +359,4 @@ void test_info_c90(const char *desc, ...) PRINTF_FORMAT(1, 2);
 extern BIO *bio_out;
 extern BIO *bio_err;
 
-int subtest_level(void);
 #endif                          /* HEADER_TESTUTIL_H */

diff --git a/test/testutil/driver.c b/test/testutil/driver.c
index 7914ea52012039203da5a0b2d08d3b0fd182c4d8..b0bd3e079afb910aa151ce00e88daa2260c46d62 100644 (file)
--- a/test/testutil/driver.c
+++ b/test/testutil/driver.c
@@ -9,6 +9,7 @@
 
 #include "../testutil.h"
 #include "output.h"
+#include "tu_local.h"
 
 #include <string.h>
 #include <assert.h>

diff --git a/test/testutil/tests.c b/test/testutil/tests.c
index b7f5bfb2a1f4839981c699673829d235e86e9e1b..cb6a3bb688dd73e634bba0f50fb61be363a34047 100644 (file)
--- a/test/testutil/tests.c
+++ b/test/testutil/tests.c
@@ -9,6 +9,7 @@
 
 #include "../testutil.h"
 #include "output.h"
+#include "tu_local.h"
 
 #include <string.h>
 #include "../../e_os.h"
@@ -44,8 +45,6 @@
 static void test_fail_message(const char *prefix, const char *file, int line,
                               const char *type, const char *fmt, ...)
             PRINTF_FORMAT(5, 6);
-int subtest_level(void);
-
 static void helper_printf_stderr(const char *fmt, ...)
 {
     va_list ap;

diff --git a/test/testutil/tu_local.h b/test/testutil/tu_local.h
new file mode 100644 (file)
index 0000000..620fccd
--- /dev/null
+++ b/test/testutil/tu_local.h
@@ -0,0 +1,10 @@
+/*
+ * Copyright 2017 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the OpenSSL license (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+int subtest_level(void);