test suite: libtest header inclusion cleanup

Added missing memoryTracking to test cases 560 and 583. If this triggers leak detection on these, it only means that previously it was going unnoticed.
2025-02-28 09:21:50 -05:00 · 2011-09-06 17:47:54 +02:00 · 2011-09-06 17:47:54 +02:00 · c8ba8740b9
commit c8ba8740b9
parent 46df51a391
33 changed files with 12 additions and 106 deletions
--- a/tests/libtest/lib502.c
+++ b/tests/libtest/lib502.c
@ -22,6 +22,7 @@
 #include "test.h"

 #include "testutil.h"
+#include "warnless.h"
 #include "memdebug.h"

 #define MAIN_LOOP_HANG_TIMEOUT     90 * 1000
--- a/tests/libtest/lib503.c
+++ b/tests/libtest/lib503.c
@ -21,8 +21,6 @@
 ***************************************************************************/
 #include "test.h"

-#include <sys/types.h>
-
 #include "testutil.h"
 #include "warnless.h"
 #include "memdebug.h"
--- a/tests/libtest/lib504.c
+++ b/tests/libtest/lib504.c
@ -21,8 +21,6 @@
 ***************************************************************************/
 #include "test.h"

-#include <sys/types.h>
-
 #include "testutil.h"
 #include "warnless.h"
 #include "memdebug.h"
--- a/tests/libtest/lib505.c
+++ b/tests/libtest/lib505.c
@ -24,12 +24,6 @@
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
--- a/tests/libtest/lib506.c
+++ b/tests/libtest/lib506.c
@ -20,8 +20,6 @@
 *
 ***************************************************************************/
 #include "test.h"
-#include <stdlib.h>
-#include <ctype.h>

 #include <curl/mprintf.h>

--- a/tests/libtest/lib518.c
+++ b/tests/libtest/lib518.c
@ -21,9 +21,6 @@
 ***************************************************************************/
 #include "test.h"

-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif
@ -33,10 +30,8 @@
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif

+#include "warnless.h"
 #include "memdebug.h"

 #ifndef FD_SETSIZE
--- a/tests/libtest/lib525.c
+++ b/tests/libtest/lib525.c
@ -21,8 +21,6 @@
 ***************************************************************************/
 #include "test.h"

-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>

 #include "testutil.h"
--- a/tests/libtest/lib526.c
+++ b/tests/libtest/lib526.c
@ -40,8 +40,6 @@

 #include "test.h"

-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>

 #include "testutil.h"
--- a/tests/libtest/lib530.c
+++ b/tests/libtest/lib530.c
@ -21,16 +21,6 @@
 ***************************************************************************/
 #include "test.h"

-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif
-
 #include "testutil.h"
 #include "warnless.h"
 #include "memdebug.h"
--- a/tests/libtest/lib533.c
+++ b/tests/libtest/lib533.c
@ -23,8 +23,6 @@

 #include "test.h"

-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>

 #include "testutil.h"
--- a/tests/libtest/lib536.c
+++ b/tests/libtest/lib536.c
@ -21,8 +21,6 @@
 ***************************************************************************/
 #include "test.h"

-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>

 #include "testutil.h"
--- a/tests/libtest/lib537.c
+++ b/tests/libtest/lib537.c
@ -21,9 +21,6 @@
 ***************************************************************************/
 #include "test.h"

-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif
@ -33,10 +30,8 @@
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
-#ifdef HAVE_STRING_H
-#include <string.h>
-#endif

+#include "warnless.h"
 #include "memdebug.h"

 #if !defined(HAVE_POLL_FINE)    && \
--- a/tests/libtest/lib541.c
+++ b/tests/libtest/lib541.c
@ -21,23 +21,10 @@
 ***************************************************************************/
 #include "test.h"

-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif

-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #include "memdebug.h"

 /*
--- a/tests/libtest/lib542.c
+++ b/tests/libtest/lib542.c
@ -21,23 +21,10 @@
 ***************************************************************************/
 #include "test.h"

-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif

-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #include "memdebug.h"

 /*
--- a/tests/libtest/lib555.c
+++ b/tests/libtest/lib555.c
@ -30,6 +30,7 @@

 #include "test.h"
 #include "testutil.h"
+#include "warnless.h"
 #include "memdebug.h"

 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000
--- a/tests/libtest/lib560.c
+++ b/tests/libtest/lib560.c
@ -22,6 +22,7 @@
 #include "test.h"

 #include "warnless.h"
+#include "memdebug.h"

 /*
 * Simply download a HTTPS file!
--- a/tests/libtest/lib562.c
+++ b/tests/libtest/lib562.c
@ -19,26 +19,12 @@
 * KIND, either express or implied.
 *
 ***************************************************************************/
-
 #include "test.h"

-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif

-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
 #include "memdebug.h"

 /*
--- a/tests/libtest/lib564.c
+++ b/tests/libtest/lib564.c
@ -19,11 +19,8 @@
 * KIND, either express or implied.
 *
 ***************************************************************************/
-
 #include "test.h"

-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>

 #include "testutil.h"
--- a/tests/libtest/lib566.c
+++ b/tests/libtest/lib566.c
@ -19,7 +19,6 @@
 * KIND, either express or implied.
 *
 ***************************************************************************/
-
 #include "test.h"

 #include "memdebug.h"
--- a/tests/libtest/lib567.c
+++ b/tests/libtest/lib567.c
@ -19,8 +19,8 @@
 * KIND, either express or implied.
 *
 ***************************************************************************/
-
 #include "test.h"
+
 #include "memdebug.h"

 /*
--- a/tests/libtest/lib568.c
+++ b/tests/libtest/lib568.c
@ -19,7 +19,6 @@
 * KIND, either express or implied.
 *
 ***************************************************************************/
-
 #include "test.h"

 #ifdef HAVE_SYS_STAT_H
--- a/tests/libtest/lib569.c
+++ b/tests/libtest/lib569.c
@ -19,7 +19,6 @@
 * KIND, either express or implied.
 *
 ***************************************************************************/
-
 #include "test.h"

 #include <curl/mprintf.h>
--- a/tests/libtest/lib570.c
+++ b/tests/libtest/lib570.c
@ -19,7 +19,6 @@
 * KIND, either express or implied.
 *
 ***************************************************************************/
-
 #include "test.h"

 #include <curl/mprintf.h>
--- a/tests/libtest/lib571.c
+++ b/tests/libtest/lib571.c
@ -19,12 +19,8 @@
 * KIND, either express or implied.
 *
 ***************************************************************************/
-
 #include "test.h"

-#ifdef HAVE_SYS_SOCKET_H
-#  include <sys/socket.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif
--- a/tests/libtest/lib572.c
+++ b/tests/libtest/lib572.c
@ -19,7 +19,6 @@
 * KIND, either express or implied.
 *
 ***************************************************************************/
-
 #include "test.h"

 #ifdef HAVE_SYS_STAT_H
--- a/tests/libtest/lib573.c
+++ b/tests/libtest/lib573.c
@ -19,10 +19,10 @@
 * KIND, either express or implied.
 *
 ***************************************************************************/
-
 #include "test.h"

 #include "testutil.h"
+#include "warnless.h"
 #include "memdebug.h"

 #define MAIN_LOOP_HANG_TIMEOUT     90 * 1000
--- a/tests/libtest/lib574.c
+++ b/tests/libtest/lib574.c
@ -19,7 +19,6 @@
 * KIND, either express or implied.
 *
 ***************************************************************************/
-
 #include "test.h"

 #include "memdebug.h"
--- a/tests/libtest/lib575.c
+++ b/tests/libtest/lib575.c
@ -19,11 +19,8 @@
 * KIND, either express or implied.
 *
 ***************************************************************************/
-
 #include "test.h"

-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>

 #include "testutil.h"
--- a/tests/libtest/lib576.c
+++ b/tests/libtest/lib576.c
@ -19,8 +19,8 @@
 * KIND, either express or implied.
 *
 ***************************************************************************/
-
 #include "test.h"
+
 #include "testutil.h"
 #include "memdebug.h"

--- a/tests/libtest/lib578.c
+++ b/tests/libtest/lib578.c
@ -19,7 +19,6 @@
 * KIND, either express or implied.
 *
 ***************************************************************************/
-
 #include "test.h"

 #include "memdebug.h"
--- a/tests/libtest/lib579.c
+++ b/tests/libtest/lib579.c
@ -19,7 +19,6 @@
 * KIND, either express or implied.
 *
 ***************************************************************************/
-
 #include "test.h"

 #include "memdebug.h"
--- a/tests/libtest/lib582.c
+++ b/tests/libtest/lib582.c
@ -21,8 +21,6 @@
 ***************************************************************************/
 #include "test.h"

-#include <sys/types.h>
-#include <sys/stat.h>
 #include <fcntl.h>

 #include "testutil.h"
--- a/tests/libtest/lib583.c
+++ b/tests/libtest/lib583.c
@ -26,9 +26,12 @@

 #include "test.h"

-#include <unistd.h>
 #include <sys/stat.h>

+#include "testutil.h"
+#include "warnless.h"
+#include "memdebug.h"
+
 int test(char *URL)
 {
  CURLMcode retVal;