Merge pull request #6714 from julek-wolfssl/rename-utils.c

Rename utils.c to utils.h

Author: JacobBarthelmeh

tests/api.c

@@ -382,8 +382,7 @@
 #endif
 #include <wolfssl/certs_test.h>
 
-#define WOLFSSL_TEST_UTILS_INCLUDED
-#include "tests/utils.c"
+#include "tests/utils.h"
 
 #ifndef WOLFSSL_HAVE_ECC_KEY_GET_PRIV
     /* FIPS build has replaced ecc.h. */

tests/include.am

@@ -70,5 +70,5 @@ EXTRA_DIST += tests/unit.h \
               tests/NCONF_test.cnf \
               tests/test-tls-downgrade.conf \
               tests/TXT_DB.txt \
-              tests/utils.c
+              tests/utils.h
 DISTCLEANFILES+= tests/.libs/unit.test

tests/utils.c tests/utils.htests/utils.c renamed to tests/utils.h

@@ -1,4 +1,4 @@
-/* utils.c
+/* utils.h
  *
  * Copyright (C) 2006-2023 wolfSSL Inc.
  *
@@ -25,12 +25,6 @@
 #include <wolfssl/wolfcrypt/settings.h>
 #include <tests/unit.h>
 
-#if !defined(WOLFSSL_TEST_UTILS_INCLUDED)
-    #ifndef WOLFSSL_IGNORE_FILE_WARN
-        #warning utils.c does not need to be compiled separately
-    #endif
-#else
-
 #ifndef NO_FILESYSTEM
 
 #ifdef _MSC_VER
@@ -365,5 +359,3 @@ void join_thread(THREAD_TYPE thread)
     THREAD_CHECK_RET(wolfSSL_JoinThread(thread));
 }
 #endif /* SINGLE_THREADED */
-
-#endif /* WOLFSSL_TEST_UTILS_INCLUDED */

testsuite/testsuite.c

@@ -45,8 +45,7 @@
 #include <examples/server/server.h>
 #include <examples/client/client.h>
 
-#define WOLFSSL_TEST_UTILS_INCLUDED
-#include "tests/utils.c"
+#include "tests/utils.h"
 
 #ifndef NO_SHA256
 void file_test(const char* file, byte* check);