summaryrefslogtreecommitdiff
path: root/tests/libtest
diff options
context:
space:
mode:
Diffstat (limited to 'tests/libtest')
-rw-r--r--tests/libtest/CMakeLists.txt2
-rw-r--r--tests/libtest/Makefile.am10
-rw-r--r--tests/libtest/Makefile.inc6
-rw-r--r--tests/libtest/lib1541.c129
4 files changed, 4 insertions, 143 deletions
diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt
index a7449c374..2f61599ea 100644
--- a/tests/libtest/CMakeLists.txt
+++ b/tests/libtest/CMakeLists.txt
@@ -7,7 +7,7 @@ function(SETUP_TEST TEST_NAME) # ARGN are the files in the test
include_directories(
${CURL_SOURCE_DIR}/lib # To be able to reach "curl_setup_once.h"
${CURL_BINARY_DIR}/lib # To be able to reach "curl_config.h"
- ${CURL_BINARY_DIR}/include # To be able to reach "curl/curlbuild.h"
+ ${CURL_BINARY_DIR}/include # To be able to reach "curl/curl.h"
)
if(USE_ARES)
include_directories(${CARES_INCLUDE_DIR})
diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
index ee29ab7db..e3d02be57 100644
--- a/tests/libtest/Makefile.am
+++ b/tests/libtest/Makefile.am
@@ -26,8 +26,6 @@ AUTOMAKE_OPTIONS = foreign nostdinc
# being currently built and tested are searched before the library which
# might possibly already be installed in the system.
#
-# $(top_builddir)/include/curl for generated curlbuild.h included from curl.h
-# $(top_builddir)/include for generated curlbuild.h inc. from lib/curl_setup.h
# $(top_srcdir)/include is for libcurl's external include files
# $(top_builddir)/lib is for libcurl's generated lib/curl_config.h file
# $(top_srcdir)/lib for libcurl's lib/curl_setup.h and other "borrowed" files
@@ -35,17 +33,13 @@ AUTOMAKE_OPTIONS = foreign nostdinc
# $(top_srcdir)/ares is for in-tree c-ares's external include files
if USE_EMBEDDED_ARES
-AM_CPPFLAGS = -I$(top_builddir)/include/curl \
- -I$(top_builddir)/include \
- -I$(top_srcdir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib \
-I$(top_builddir)/ares \
-I$(top_srcdir)/ares
else
-AM_CPPFLAGS = -I$(top_builddir)/include/curl \
- -I$(top_builddir)/include \
- -I$(top_srcdir)/include \
+AM_CPPFLAGS = -I$(top_srcdir)/include \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib
endif
diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc
index d344a1218..2f71391e2 100644
--- a/tests/libtest/Makefile.inc
+++ b/tests/libtest/Makefile.inc
@@ -25,7 +25,7 @@ noinst_PROGRAMS = chkhostname libauthretry libntlmconnect \
lib1520 \
lib1525 lib1526 lib1527 lib1528 lib1529 lib1530 lib1531 lib1532 lib1533 \
lib1534 lib1535 lib1536 \
- lib1540 lib1541 \
+ lib1540 \
lib1900 \
lib2033
@@ -420,10 +420,6 @@ lib1540_SOURCES = lib1540.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
lib1540_LDADD = $(TESTUTIL_LIBS)
lib1540_CPPFLAGS = $(AM_CPPFLAGS)
-lib1541_SOURCES = lib1541.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
-lib1541_LDADD = $(TESTUTIL_LIBS)
-lib1541_CPPFLAGS = $(AM_CPPFLAGS)
-
lib1900_SOURCES = lib1900.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
lib1900_LDADD = $(TESTUTIL_LIBS)
lib1900_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/tests/libtest/lib1541.c b/tests/libtest/lib1541.c
deleted file mode 100644
index 3675592ff..000000000
--- a/tests/libtest/lib1541.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/***************************************************************************
- * _ _ ____ _
- * Project ___| | | | _ \| |
- * / __| | | | |_) | |
- * | (__| |_| | _ <| |___
- * \___|\___/|_| \_\_____|
- *
- * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
- *
- * This software is licensed as described in the file COPYING, which
- * you should have received as part of this distribution. The terms
- * are also available at https://curl.haxx.se/docs/copyright.html.
- *
- * You may opt to use, copy, modify, merge, publish, distribute and/or sell
- * copies of the Software, and permit persons to whom the Software is
- * furnished to do so, under the terms of the COPYING file.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ***************************************************************************/
-#include "test.h"
-
-#include "testutil.h"
-#include "warnless.h"
-#include "memdebug.h"
-
-#define XSTR(x) #x
-#define STRING(y) XSTR(y)
-
-int test(char *URL)
-{
- char detect[512];
- char syst[512];
-
- const char *types_h = "No";
- const char *socket_h = "No";
- const char *ws2tcpip_h = "No";
- const char *stypes_h = "No";
- const char *ssocket_h = "No";
- const char *sws2tcpip_h = "No";
-
- (void)(URL);
-
-#ifdef CURL_PULL_SYS_TYPES_H
- types_h = "Yes";
-#endif
-#ifdef CURL_PULL_SYS_SOCKET_H
- socket_h = "Yes";
-#endif
-#ifdef CURL_PULL_WS2TCPIP_H
- ws2tcpip_h = "Yes";
-#endif
- snprintf(detect, sizeof(detect),
-#ifdef CHECK_CURL_OFF_T
- "CURL_TYPEOF_CURL_OFF_T: %s\n"
-#endif
- "CURL_FORMAT_CURL_OFF_T: %s\n"
- "CURL_FORMAT_CURL_OFF_TU: %s\n"
- "CURL_SUFFIX_CURL_OFF_T: %s\n"
- "CURL_SUFFIX_CURL_OFF_TU: %s\n"
- "CURL_SIZEOF_CURL_OFF_T: %d\n"
- "CURL_SIZEOF_LONG: %d\n"
- "CURL_TYPEOF_CURL_SOCKLEN_T: %s\n"
- "CURL_PULL_SYS_TYPES_H: %s\n"
- "CURL_PULL_SYS_SOCKET_H: %s\n"
- "CURL_PULL_WS2TCPIP_H: %s\n"
-
-#ifdef CHECK_CURL_OFF_T
- , STRING(CURL_TYPEOF_CURL_OFF_T)
-#endif
- , CURL_FORMAT_CURL_OFF_T
- , CURL_FORMAT_CURL_OFF_TU
- , STRING(CURL_SUFFIX_CURL_OFF_T)
- , STRING(CURL_SUFFIX_CURL_OFF_TU)
- , CURL_SIZEOF_CURL_OFF_T
- , CURL_SIZEOF_LONG
- , STRING(CURL_TYPEOF_CURL_SOCKLEN_T)
- , types_h
- , socket_h
- , ws2tcpip_h);
-
-#ifdef CURLSYS_PULL_SYS_TYPES_H
- stypes_h = "Yes";
-#endif
-#ifdef CURLSYS_PULL_SYS_SOCKET_H
- ssocket_h = "Yes";
-#endif
-#ifdef CURLSYS_PULL_WS2TCPIP_H
- sws2tcpip_h = "Yes";
-#endif
- snprintf(syst, sizeof(syst),
-#ifdef CHECK_CURL_OFF_T
- "CURL_TYPEOF_CURL_OFF_T: %s\n"
-#endif
- "CURL_FORMAT_CURL_OFF_T: %s\n"
- "CURL_FORMAT_CURL_OFF_TU: %s\n"
- "CURL_SUFFIX_CURL_OFF_T: %s\n"
- "CURL_SUFFIX_CURL_OFF_TU: %s\n"
- "CURL_SIZEOF_CURL_OFF_T: %d\n"
- "CURL_SIZEOF_LONG: %d\n"
- "CURL_TYPEOF_CURL_SOCKLEN_T: %s\n"
- "CURL_PULL_SYS_TYPES_H: %s\n"
- "CURL_PULL_SYS_SOCKET_H: %s\n"
- "CURL_PULL_WS2TCPIP_H: %s\n"
-
-#ifdef CHECK_CURL_OFF_T
- , STRING(CURLSYS_TYPEOF_CURL_OFF_T)
-#endif
- , CURLSYS_FORMAT_CURL_OFF_T
- , CURLSYS_FORMAT_CURL_OFF_TU
- , STRING(CURLSYS_SUFFIX_CURL_OFF_T)
- , STRING(CURLSYS_SUFFIX_CURL_OFF_TU)
- , CURLSYS_SIZEOF_CURL_OFF_T
- , CURLSYS_SIZEOF_LONG
- , STRING(CURLSYS_TYPEOF_CURL_SOCKLEN_T)
- , stypes_h
- , ssocket_h
- , sws2tcpip_h);
-
- if(strcmp(detect, syst)) {
- printf("===> Type detection failed <====\n");
- printf("[Detected]\n%s", detect);
- printf("[System]\n%s", syst);
- return 1; /* FAIL! */
- }
-
- return 0;
-}
View Lorry Controller Status