diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/libtest/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/libtest/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/libtest/test.h | 6 | ||||
| -rwxr-xr-x | tests/runtests.pl | 4 | ||||
| -rw-r--r-- | tests/server/.cvsignore | 2 | ||||
| -rw-r--r-- | tests/server/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/server/Makefile.am | 2 | ||||
| -rwxr-xr-x | tests/testcurl.pl | 2 |
8 files changed, 11 insertions, 11 deletions
diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt index 08edbd0c9..74d841e01 100644 --- a/tests/libtest/CMakeLists.txt +++ b/tests/libtest/CMakeLists.txt @@ -6,7 +6,7 @@ function(SETUP_TEST TEST_NAME) # ARGN are the files in the test include_directories( ${CURL_SOURCE_DIR}/lib # To be able to reach "setup_once.h" - ${CURL_BINARY_DIR}/lib # To be able to reach "config.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 c5b8762cf..68b446c12 100644 --- a/tests/libtest/Makefile.am +++ b/tests/libtest/Makefile.am @@ -29,7 +29,7 @@ AUTOMAKE_OPTIONS = foreign nostdinc # # $(top_builddir)/include is for libcurl's generated curl/curlbuild.h file # $(top_srcdir)/include is for libcurl's external include files -# $(top_builddir)/lib is for libcurl's generated lib/config.h file +# $(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_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/test.h b/tests/libtest/test.h index c66fd61d7..66416b42a 100644 --- a/tests/libtest/test.h +++ b/tests/libtest/test.h @@ -9,9 +9,9 @@ */ /* Now include the setup.h file from libcurl's private libdir (the source - version, but that might include "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 */ + 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 */ #include "setup.h" diff --git a/tests/runtests.pl b/tests/runtests.pl index b65bcebcd..2b6dda8fa 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -1614,8 +1614,8 @@ sub checksystem { die "couldn't get curl's version"; } - if(-r "../lib/config.h") { - open(CONF, "<../lib/config.h"); + if(-r "../lib/curl_config.h") { + open(CONF, "<../lib/curl_config.h"); while(<CONF>) { if($_ =~ /^\#define HAVE_GETRLIMIT/) { $has_getrlimit = 1; diff --git a/tests/server/.cvsignore b/tests/server/.cvsignore index 56a4e719e..c843da763 100644 --- a/tests/server/.cvsignore +++ b/tests/server/.cvsignore @@ -3,7 +3,7 @@ Makefile.in sws .deps stamp-h* -config.h +curl_config.h Makefile getpart sockfilt diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt index c9b32e16f..01db82401 100644 --- a/tests/server/CMakeLists.txt +++ b/tests/server/CMakeLists.txt @@ -6,7 +6,7 @@ function(SETUP_EXECUTABLE TEST_NAME) # ARGN are the files in the test include_directories( ${CURL_SOURCE_DIR}/lib # To be able to reach "setup_once.h" - ${CURL_BINARY_DIR}/lib # To be able to reach "config.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/server/Makefile.am b/tests/server/Makefile.am index c8863c265..63481a220 100644 --- a/tests/server/Makefile.am +++ b/tests/server/Makefile.am @@ -29,7 +29,7 @@ AUTOMAKE_OPTIONS = foreign nostdinc # # $(top_builddir)/include is for libcurl's generated curl/curlbuild.h file # $(top_srcdir)/include is for libcurl's external include files -# $(top_builddir)/lib is for libcurl's generated lib/config.h file +# $(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_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/testcurl.pl b/tests/testcurl.pl index 2e57460da..ddf030409 100755 --- a/tests/testcurl.pl +++ b/tests/testcurl.pl @@ -230,7 +230,7 @@ sub mydie($){ sub get_host_triplet { my $triplet; - my $configfile = "$pwd/$build/lib/config.h"; + my $configfile = "$pwd/$build/lib/curl_config.h"; if(-f $configfile && -s $configfile && open(LIBCONFIGH, "<$configfile")) { while(<LIBCONFIGH>) { |