summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/libtest/CMakeLists.txt2
-rw-r--r--tests/libtest/Makefile.am4
-rw-r--r--tests/libtest/chkhostname.c2
-rw-r--r--tests/libtest/sethostname.c2
-rw-r--r--tests/libtest/test.h4
-rw-r--r--tests/libtest/testutil.c2
-rw-r--r--tests/libtest/testutil.h2
-rw-r--r--tests/server/CMakeLists.txt4
-rw-r--r--tests/server/Makefile.am4
-rw-r--r--tests/server/server_setup.h2
-rw-r--r--tests/unit/Makefile.am4
11 files changed, 16 insertions, 16 deletions
diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt
index 896686bd8..733cdd31b 100644
--- a/tests/libtest/CMakeLists.txt
+++ b/tests/libtest/CMakeLists.txt
@@ -5,7 +5,7 @@ function(SETUP_TEST TEST_NAME) # ARGN are the files in the test
string(TOUPPER ${TEST_NAME} UPPER_TEST_NAME)
include_directories(
- ${CURL_SOURCE_DIR}/lib # To be able to reach "setup_once.h"
+ ${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"
)
diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
index df13df111..ba4097f8e 100644
--- a/tests/libtest/Makefile.am
+++ b/tests/libtest/Makefile.am
@@ -27,10 +27,10 @@ AUTOMAKE_OPTIONS = foreign nostdinc
# 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 included from lib/setup.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 is for libcurl's lib/setup.h and other "borrowed" files
+# $(top_srcdir)/lib for libcurl's lib/curl_setup.h and other "borrowed" files
# $(top_builddir)/ares is for in-tree c-ares's generated ares_build.h file
# $(top_srcdir)/ares is for in-tree c-ares's external include files
diff --git a/tests/libtest/chkhostname.c b/tests/libtest/chkhostname.c
index a18c92e8f..168294ab6 100644
--- a/tests/libtest/chkhostname.c
+++ b/tests/libtest/chkhostname.c
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#include "curl_gethostname.h"
diff --git a/tests/libtest/sethostname.c b/tests/libtest/sethostname.c
index f131fe9fb..9da6a6730 100644
--- a/tests/libtest/sethostname.c
+++ b/tests/libtest/sethostname.c
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#include "sethostname.h"
diff --git a/tests/libtest/test.h b/tests/libtest/test.h
index fcc91ad8b..5de8c7c75 100644
--- a/tests/libtest/test.h
+++ b/tests/libtest/test.h
@@ -20,14 +20,14 @@
*
***************************************************************************/
-/* Now include the setup.h file from libcurl's private libdir (the source
+/* Now include the curl_setup.h file from libcurl's private libdir (the source
version, but that might include "curl_config.h" from the build dir so we
need both of them in the include path), so that we get good in-depth
knowledge about the system we're building this on */
#define CURL_NO_OLDIES
-#include "setup.h"
+#include "curl_setup.h"
#include <curl/curl.h>
diff --git a/tests/libtest/testutil.c b/tests/libtest/testutil.c
index 3ad18c987..b18a60734 100644
--- a/tests/libtest/testutil.c
+++ b/tests/libtest/testutil.c
@@ -19,7 +19,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
#include "testutil.h"
#include "memdebug.h"
diff --git a/tests/libtest/testutil.h b/tests/libtest/testutil.h
index 0c6be2fc4..a236970a6 100644
--- a/tests/libtest/testutil.h
+++ b/tests/libtest/testutil.h
@@ -21,7 +21,7 @@
* KIND, either express or implied.
*
***************************************************************************/
-#include "setup.h"
+#include "curl_setup.h"
struct timeval tutil_tvnow(void);
diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt
index 0401df215..69cc56cfc 100644
--- a/tests/server/CMakeLists.txt
+++ b/tests/server/CMakeLists.txt
@@ -5,8 +5,8 @@ function(SETUP_EXECUTABLE TEST_NAME) # ARGN are the files in the test
string(TOUPPER ${TEST_NAME} UPPER_TEST_NAME)
include_directories(
- ${CURL_SOURCE_DIR}/lib # To be able to reach "setup_once.h"
- ${CURL_BINARY_DIR}/lib # To be able to reach "curl_config.h"
+ ${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"
)
if(CURL_USE_ARES)
diff --git a/tests/server/Makefile.am b/tests/server/Makefile.am
index d4ef252db..7533a98b7 100644
--- a/tests/server/Makefile.am
+++ b/tests/server/Makefile.am
@@ -27,10 +27,10 @@ AUTOMAKE_OPTIONS = foreign nostdinc
# 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 included from lib/setup.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 is for libcurl's lib/setup.h and other "borrowed" files
+# $(top_srcdir)/lib for libcurl's lib/curl_setup.h and other "borrowed" files
# $(top_builddir)/ares is for in-tree c-ares's generated ares_build.h file
# $(top_srcdir)/ares is for in-tree c-ares's external include files
diff --git a/tests/server/server_setup.h b/tests/server/server_setup.h
index 193ad84d7..59e369586 100644
--- a/tests/server/server_setup.h
+++ b/tests/server/server_setup.h
@@ -24,6 +24,6 @@
#define CURL_NO_OLDIES
-#include "setup.h" /* portability help from the lib directory */
+#include "curl_setup.h" /* portability help from the lib directory */
#endif /* HEADER_CURL_SERVER_SETUP_H */
diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index eb29241ad..12d5fe314 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -27,10 +27,10 @@ AUTOMAKE_OPTIONS = foreign nostdinc
# 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 included from lib/setup.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 is for libcurl's lib/setup.h and other "borrowed" files
+# $(top_srcdir)/lib for libcurl's lib/curl_setup.h and other "borrowed" files
# $(top_builddir)/ares is for in-tree c-ares's generated ares_build.h file
# $(top_srcdir)/ares is for in-tree c-ares's external include files