From: Richard Levitte <levitte@openssl.org>
Date: Fri, 28 Apr 2017 12:42:46 +0000 (+0200)
Subject: testutil: make subtest_level() internal
X-Git-Tag: OpenSSL_1_1_1-pre1~1633
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c5657cb71011eb2471f6d70e558919d3da561f39;p=oweals%2Fopenssl.git

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 66b9e814ee..1826470697 100644
--- 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 7914ea5201..b0bd3e079a 100644
--- 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 b7f5bfb2a1..cb6a3bb688 100644
--- 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
index 0000000000..620fccd278
--- /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);