diff options
Diffstat (limited to 'tests')
46 files changed, 105 insertions, 126 deletions
diff --git a/tests/.gitignore b/tests/.gitignore index fbbc16485..80e90dbf5 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -17,3 +17,8 @@ runtests.html runtests.pdf testcurl.html testcurl.pdf + +dictserver.py +smbserver.py +curl_test_data.py +negtelnetserver.py diff --git a/tests/Makefile.am b/tests/Makefile.am index f830ae417..cb08088b9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -20,8 +20,6 @@ # ########################################################################### -HTMLPAGES = testcurl.html runtests.html -PDFPAGES = testcurl.pdf runtests.pdf MANDISTPAGES = runtests.1.dist testcurl.1.dist # the path to the impacket python lib used for SMB tests @@ -29,17 +27,19 @@ IMP = python_dependencies/impacket SMBDEPS = $(IMP)/__init__.py $(IMP)/nmb.py $(IMP)/nt_errors.py \ $(IMP)/ntlm.py $(IMP)/smb.py $(IMP)/smb3.py $(IMP)/smb3structs.py \ $(IMP)/smbserver.py $(IMP)/spnego.py $(IMP)/structure.py \ - $(IMP)/uuid.py $(IMP)/version.py smbserver.py curl_test_data.py + $(IMP)/uuid.py $(IMP)/version.py smbserver.py.in curl_test_data.py.in EXTRA_DIST = ftpserver.pl httpserver.pl secureserver.pl runtests.pl \ getpart.pm FILEFORMAT README stunnel.pem memanalyze.pl testcurl.pl \ valgrind.pm ftp.pm sshserver.pl sshhelp.pm pathhelp.pm testcurl.1 runtests.1 \ serverhelp.pm tftpserver.pl rtspserver.pl directories.pm symbol-scan.pl \ CMakeLists.txt mem-include-scan.pl valgrind.supp extern-scan.pl \ - manpage-scan.pl nroff-scan.pl http2-server.pl dictserver.py \ - negtelnetserver.py $(SMBDEPS) objnames-test08.sh objnames-test10.sh \ + manpage-scan.pl nroff-scan.pl http2-server.pl dictserver.py.in \ + negtelnetserver.py.in $(SMBDEPS) objnames-test08.sh objnames-test10.sh \ objnames.inc disable-scan.pl manpage-syntax.pl +check_SCRIPTS = smbserver.py curl_test_data.py negtelnetserver.py dictserver.py + DISTCLEANFILES = configurehelp.pm # we have two variables here to make sure DIST_SUBDIRS won't get 'unit' @@ -60,7 +60,29 @@ PERLFLAGS = -I$(srcdir) CLEANFILES = .http.pid .https.pid .ftp.pid .ftps.pid $(MANDISTPAGES) -MAN2HTML= roffit $< >$@ +do_subst = $(AWK) -v python=$(PYTHON) '{gsub("AWKPYTHON",python,$$0); print $$0}' + +SUFFIXES = .py.in .py + +.py.in.py: + $(do_subst) < $< > $@ + @chmod +x $@ + +smbserver.py: smbserver.py.in Makefile + $(do_subst) < $(srcdir)/smbserver.py.in > smbserver.py + @chmod +x smbserver.py + +curl_test_data.py: curl_test_data.py.in Makefile + $(do_subst) < $(srcdir)/curl_test_data.py.in > curl_test_data.py + @chmod +x curl_test_data.py + +negtelnetserver.py: negtelnetserver.py.in Makefile + $(do_subst) < $(srcdir)/negtelnetserver.py.in > negtelnetserver.py + @chmod +x negtelnetserver.py + +dictserver.py: dictserver.py.in Makefile + $(do_subst) < $(srcdir)/dictserver.py.in > dictserver.py + @chmod +x dictserver.py curl: @cd $(top_builddir) && $(MAKE) @@ -68,7 +90,11 @@ curl: if CROSSCOMPILING TEST = @echo "NOTICE: we can't run the tests when cross-compiling!" else # if not cross-compiling: +if VALGRIND TEST = srcdir=$(srcdir) $(PERL) $(PERLFLAGS) $(srcdir)/runtests.pl +else +TEST = srcdir=$(srcdir) $(PERL) $(PERLFLAGS) $(srcdir)/runtests.pl -n +endif # disable_valgrind TEST_Q = -a -s TEST_AM = -a -am TEST_F = -a -p -r @@ -83,7 +109,7 @@ endif perlcheck: @if ! test -x "$(PERL)"; then echo "No perl!"; exit 2; fi -test: perlcheck all +test: perlcheck all $(check_SCRIPTS) $(TEST) $(TFLAGS) quiet-test: perlcheck all @@ -104,16 +130,6 @@ torture-test: perlcheck all event-test: perlcheck all $(TEST) $(TEST_E) $(TFLAGS) -.1.html: - $(MAN2HTML) - -.1.pdf: - @(foo=`echo $@ | sed -e 's/\.[0-9]$$//g'`; \ - groff -Tps -man $< >$$foo.ps; \ - ps2pdf $$foo.ps $@; \ - rm $$foo.ps; \ - echo "converted $< to $@") - checksrc: cd libtest && $(MAKE) checksrc cd unit && $(MAKE) checksrc diff --git a/tests/certs/scripts/genroot.sh b/tests/certs/scripts/genroot.sh index f66fc6554..40fbd365a 100755 --- a/tests/certs/scripts/genroot.sh +++ b/tests/certs/scripts/genroot.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # (c) CopyRight EdelWeb for EdelKey and OpenEvidence, 2000-2004, 2009 # Author: Peter Sylvester diff --git a/tests/certs/scripts/genserv.sh b/tests/certs/scripts/genserv.sh index f0f440320..d09ab0559 100755 --- a/tests/certs/scripts/genserv.sh +++ b/tests/certs/scripts/genserv.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # (c) CopyRight EdelWeb for EdelKey and OpenEvidence, 2000-2004, 2009 # Author: Peter Sylvester diff --git a/tests/curl_test_data.py b/tests/curl_test_data.py.in index 21747407d..6928b2c2b 100755 --- a/tests/curl_test_data.py +++ b/tests/curl_test_data.py.in @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!AWKPYTHON # -*- coding: utf-8 -*- # # Project ___| | | | _ \| | diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc index 6ec5a3c18..27d80514f 100644 --- a/tests/data/Makefile.inc +++ b/tests/data/Makefile.inc @@ -111,7 +111,7 @@ test945 test946 test947 test948 test949 test950 test951 test952 \ test1000 test1001 test1002 test1003 test1004 test1005 test1006 test1007 \ test1008 test1009 test1010 test1011 test1012 test1013 test1014 test1015 \ test1016 test1017 test1018 test1019 test1020 test1021 test1022 test1023 \ -test1024 test1025 test1026 test1027 test1028 test1029 test1030 test1031 \ +test1024 test1025 test1027 test1028 test1029 test1030 test1031 \ test1032 test1033 test1034 test1035 test1036 test1037 test1038 test1039 \ test1040 test1041 test1042 test1043 test1044 test1045 test1046 test1047 \ test1048 test1049 test1050 test1051 test1052 test1053 test1054 test1055 \ @@ -125,7 +125,7 @@ test1104 test1105 test1106 test1107 test1108 test1109 test1110 test1111 \ test1112 test1113 test1114 test1115 test1116 test1117 test1118 test1119 \ test1120 test1121 test1122 test1123 test1124 test1125 test1126 test1127 \ test1128 test1129 test1130 test1131 test1132 test1133 test1134 test1135 \ -test1136 test1137 test1138 test1139 test1140 test1141 test1142 test1143 \ +test1136 test1137 test1138 test1141 test1142 test1143 \ test1144 test1145 test1146 test1147 test1148 test1149 test1150 test1151 \ test1152 test1153 test1154 test1155 test1156 test1157 test1158 test1159 \ test1160 test1161 test1162 test1163 test1164 test1165 \ diff --git a/tests/data/test1013 b/tests/data/test1013 index 9a1e6d4e3..244dcf599 100644 --- a/tests/data/test1013 +++ b/tests/data/test1013 @@ -23,7 +23,7 @@ Compare curl --version with curl-config --protocols --version </command> <postcheck> -%SRCDIR/libtest/test1013.pl ../curl-config log/stdout1013 protocols +%SRCDIR/libtest/test1013.pl ../gnurl-config log/stdout1013 protocols </postcheck> </client> diff --git a/tests/data/test1014 b/tests/data/test1014 index 5116aad7c..e00defa81 100644 --- a/tests/data/test1014 +++ b/tests/data/test1014 @@ -23,7 +23,7 @@ Compare curl --version with curl-config --features --version </command> <postcheck> -%SRCDIR/libtest/test1013.pl ../curl-config log/stdout1014 features +%SRCDIR/libtest/test1013.pl ../gnurl-config log/stdout1014 features </postcheck> </client> diff --git a/tests/data/test1022 b/tests/data/test1022 index 6a8b01258..ecd83a332 100644 --- a/tests/data/test1022 +++ b/tests/data/test1022 @@ -23,7 +23,7 @@ Compare curl --version with curl-config --version --version </command> <postcheck> -%SRCDIR/libtest/test1022.pl ../curl-config log/stdout1022 version +%SRCDIR/libtest/test1022.pl ../gnurl-config log/stdout1022 version </postcheck> </client> diff --git a/tests/data/test1023 b/tests/data/test1023 index 9c916a085..5f4d756ae 100644 --- a/tests/data/test1023 +++ b/tests/data/test1023 @@ -23,7 +23,7 @@ Compare curl --version with curl-config --vernum --version </command> <postcheck> -%SRCDIR/libtest/test1022.pl ../curl-config log/stdout1023 vernum +%SRCDIR/libtest/test1022.pl ../gnurl-config log/stdout1023 vernum </postcheck> </client> diff --git a/tests/data/test1026 b/tests/data/test1026 deleted file mode 100644 index 6bda7a43f..000000000 --- a/tests/data/test1026 +++ /dev/null @@ -1,42 +0,0 @@ -<testcase> -<info> -<keywords> ---manual -</keywords> -</info> - -# -# Server-side -<reply> -</reply> - -# -# Client-side -<client> -<features> -manual -</features> -<server> -none -</server> - <name> -curl --manual - </name> - <command> ---manual -</command> -# Search for these two sentinel lines in the manual output; if they are found, -# then chances are good the entire manual is there. -<postcheck> -perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(curl\s*-\s*transfer\sa\s*URL)|(CONTRIBUTORS)/, <IN>); exit ($lines != 2); # Let this file pass an XML syntax check: </IN>' log/stdout1026 -</postcheck> -</client> - -# -# Verify data after the test has been "shot" -<verify> -<errorcode> -0 -</errorcode> -</verify> -</testcase> diff --git a/tests/data/test1119 b/tests/data/test1119 index 017f598f3..7406521c4 100644 --- a/tests/data/test1119 +++ b/tests/data/test1119 @@ -18,7 +18,7 @@ Verify that symbols-in-versions and headers are in sync </name> <command type="perl"> -%SRCDIR/symbol-scan.pl %SRCDIR/.. ../include/curl +%SRCDIR/symbol-scan.pl %SRCDIR/.. ../include/gnurl </command> </client> diff --git a/tests/data/test1139 b/tests/data/test1139.skip index 72761c670..470682e11 100644 --- a/tests/data/test1139 +++ b/tests/data/test1139.skip @@ -16,7 +16,7 @@ none </server> <name> -Verify that all libcurl options have man pages +Verify that all libgnurl options have man pages </name> <command type="perl"> diff --git a/tests/data/test1140 b/tests/data/test1140.skip index b9458be9f..b9458be9f 100644 --- a/tests/data/test1140 +++ b/tests/data/test1140.skip diff --git a/tests/data/test1400 b/tests/data/test1400 index c0d409bac..9f6bd47a2 100644 --- a/tests/data/test1400 +++ b/tests/data/test1400 @@ -63,7 +63,7 @@ $_ = '' if /CURLOPT_INTERLEAVEDATA/ * All curl_easy_setopt() options are documented at: * https://curl.haxx.se/libcurl/c/curl_easy_setopt.html ************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> int main(int argc, char *argv[]) { diff --git a/tests/data/test1401 b/tests/data/test1401 index 647f036f4..2cb43b7ee 100644 --- a/tests/data/test1401 +++ b/tests/data/test1401 @@ -68,7 +68,7 @@ $_ = '' if /CURLOPT_INTERLEAVEDATA/ * All curl_easy_setopt() options are documented at: * https://curl.haxx.se/libcurl/c/curl_easy_setopt.html ************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> int main(int argc, char *argv[]) { diff --git a/tests/data/test1402 b/tests/data/test1402 index b9f52f2e8..a806a16ff 100644 --- a/tests/data/test1402 +++ b/tests/data/test1402 @@ -66,7 +66,7 @@ $_ = '' if /CURLOPT_INTERLEAVEDATA/ * All curl_easy_setopt() options are documented at: * https://curl.haxx.se/libcurl/c/curl_easy_setopt.html ************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> int main(int argc, char *argv[]) { diff --git a/tests/data/test1403 b/tests/data/test1403 index db13081b0..b73d93004 100644 --- a/tests/data/test1403 +++ b/tests/data/test1403 @@ -63,7 +63,7 @@ $_ = '' if /CURLOPT_INTERLEAVEDATA/ * All curl_easy_setopt() options are documented at: * https://curl.haxx.se/libcurl/c/curl_easy_setopt.html ************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> int main(int argc, char *argv[]) { diff --git a/tests/data/test1404 b/tests/data/test1404 index e976f0b38..6a83e0043 100644 --- a/tests/data/test1404 +++ b/tests/data/test1404 @@ -103,7 +103,7 @@ $_ = '' if /\/\* "value" \*\// * All curl_easy_setopt() options are documented at: * https://curl.haxx.se/libcurl/c/curl_easy_setopt.html ************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> int main(int argc, char *argv[]) { diff --git a/tests/data/test1405 b/tests/data/test1405 index dcc8f80b0..a1902bb72 100644 --- a/tests/data/test1405 +++ b/tests/data/test1405 @@ -63,7 +63,7 @@ QUIT * All curl_easy_setopt() options are documented at: * https://curl.haxx.se/libcurl/c/curl_easy_setopt.html ************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> int main(int argc, char *argv[]) { diff --git a/tests/data/test1406 b/tests/data/test1406 index ab835d3cb..fb134b1f3 100644 --- a/tests/data/test1406 +++ b/tests/data/test1406 @@ -62,7 +62,7 @@ body * All curl_easy_setopt() options are documented at: * https://curl.haxx.se/libcurl/c/curl_easy_setopt.html ************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> int main(int argc, char *argv[]) { diff --git a/tests/data/test1407 b/tests/data/test1407 index 917a5deb7..bc25cebfb 100644 --- a/tests/data/test1407 +++ b/tests/data/test1407 @@ -49,7 +49,7 @@ QUIT * All curl_easy_setopt() options are documented at: * https://curl.haxx.se/libcurl/c/curl_easy_setopt.html ************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> int main(int argc, char *argv[]) { diff --git a/tests/data/test1420 b/tests/data/test1420 index ebd45ff84..b47510511 100644 --- a/tests/data/test1420 +++ b/tests/data/test1420 @@ -55,7 +55,7 @@ A005 LOGOUT * All curl_easy_setopt() options are documented at: * https://curl.haxx.se/libcurl/c/curl_easy_setopt.html ************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> int main(int argc, char *argv[]) { diff --git a/tests/dictserver.py b/tests/dictserver.py.in index 2d1b5a3b6..9f2cc984b 100755 --- a/tests/dictserver.py +++ b/tests/dictserver.py.in @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!AWKPYTHON # -*- coding: utf-8 -*- # """ DICT server """ diff --git a/tests/extern-scan.pl b/tests/extern-scan.pl index 88594ed69..1b22410f5 100755 --- a/tests/extern-scan.pl +++ b/tests/extern-scan.pl @@ -30,10 +30,10 @@ use warnings; my $root=$ARGV[0] || "."; my @incs = ( - "$root/include/curl/curl.h", - "$root/include/curl/easy.h", - "$root/include/curl/mprintf.h", - "$root/include/curl/multi.h", + "$root/include/gnurl/curl.h", + "$root/include/gnurl/easy.h", + "$root/include/gnurl/mprintf.h", + "$root/include/gnurl/multi.h", ); my $verbose=0; diff --git a/tests/fuzz/download_fuzzer.sh b/tests/fuzz/download_fuzzer.sh index 0a841780e..b19fbb7ba 100755 --- a/tests/fuzz/download_fuzzer.sh +++ b/tests/fuzz/download_fuzzer.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # If any commands fail, fail the script immediately. set -ex diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt index aa70d053d..88b571b76 100644 --- a/tests/libtest/CMakeLists.txt +++ b/tests/libtest/CMakeLists.txt @@ -11,14 +11,14 @@ 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/curl.h" + ${CURL_BINARY_DIR}/include # To be able to reach "gnurl/curl.h" ${CURL_SOURCE_DIR}/tests/libtest # To be able to build generated tests ) if(USE_ARES) include_directories(${CARES_INCLUDE_DIR}) endif() - target_link_libraries(${TEST_NAME} libcurl ${CURL_LIBS}) + target_link_libraries(${TEST_NAME} libgnurl ${CURL_LIBS}) set_target_properties(${TEST_NAME} PROPERTIES COMPILE_DEFINITIONS ${UPPER_TEST_NAME}) @@ -54,10 +54,10 @@ endif() add_custom_command( OUTPUT lib1521.c - COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/mk-lib1521.pl < ${CURL_SOURCE_DIR}/include/curl/curl.h > lib1521.c + COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/mk-lib1521.pl < ${CURL_SOURCE_DIR}/include/gnurl/curl.h > lib1521.c DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/mk-lib1521.pl" - "${CURL_SOURCE_DIR}/include/curl/curl.h" + "${CURL_SOURCE_DIR}/include/gnurl/curl.h" VERBATIM) set_property(TARGET chkdecimalpoint diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am index 29ab0a9c4..a2281c456 100644 --- a/tests/libtest/Makefile.am +++ b/tests/libtest/Makefile.am @@ -57,11 +57,11 @@ CLEANFILES = lib1521.c LIBS = $(BLANK_AT_MAKETIME) if USE_EXPLICIT_LIB_DEPS -SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl.la @LIBCURL_LIBS@ -TESTUTIL_LIBS = $(top_builddir)/lib/libcurl.la @LIBCURL_LIBS@ +SUPPORTFILES_LIBS = $(top_builddir)/lib/libgnurl.la @LIBCURL_LIBS@ +TESTUTIL_LIBS = $(top_builddir)/lib/libgnurl.la @LIBCURL_LIBS@ else -SUPPORTFILES_LIBS = $(top_builddir)/lib/libcurl.la @CURL_NETWORK_LIBS@ @NSS_LIBS@ -TESTUTIL_LIBS = $(top_builddir)/lib/libcurl.la @CURL_NETWORK_AND_TIME_LIBS@ @NSS_LIBS@ +SUPPORTFILES_LIBS = $(top_builddir)/lib/libgnurl.la @CURL_NETWORK_LIBS@ +TESTUTIL_LIBS = $(top_builddir)/lib/libgnurl.la @CURL_NETWORK_AND_TIME_LIBS@ endif # Dependencies (may need to be overridden) @@ -128,8 +128,8 @@ libstubgss_la_DEPENDENCIES = endif -lib1521.c: $(top_srcdir)/tests/libtest/mk-lib1521.pl $(top_srcdir)/include/curl/curl.h - @PERL@ $(top_srcdir)/tests/libtest/mk-lib1521.pl < $(top_srcdir)/include/curl/curl.h > lib1521.c +lib1521.c: $(top_srcdir)/tests/libtest/mk-lib1521.pl $(top_srcdir)/include/gnurl/curl.h + @PERL@ $(top_srcdir)/tests/libtest/mk-lib1521.pl < $(top_srcdir)/include/gnurl/curl.h > lib1521.c CHECKSRC = $(CS_$(V)) CS_0 = @echo " RUN " $@; diff --git a/tests/libtest/lib1550.c b/tests/libtest/lib1550.c index d3e17e4fe..1df5503fd 100644 --- a/tests/libtest/lib1550.c +++ b/tests/libtest/lib1550.c @@ -23,7 +23,7 @@ #include "memdebug.h" -#include <curl/multi.h> +#include <gnurl/multi.h> int test(char *URL) { diff --git a/tests/libtest/lib1551.c b/tests/libtest/lib1551.c index 36ba75715..edd6e9c8f 100644 --- a/tests/libtest/lib1551.c +++ b/tests/libtest/lib1551.c @@ -23,7 +23,7 @@ #include "memdebug.h" -#include <curl/multi.h> +#include <gnurl/multi.h> int test(char *URL) { diff --git a/tests/libtest/mk-lib1521.pl b/tests/libtest/mk-lib1521.pl index f4add1a02..9f25ce2fb 100755 --- a/tests/libtest/mk-lib1521.pl +++ b/tests/libtest/mk-lib1521.pl @@ -22,7 +22,7 @@ ########################################################################### # Usage: -# perl mk-lib1521.pl < ../../include/curl/curl.h > lib1521.c +# perl mk-lib1521.pl < ../../include/gnurl/curl.h > lib1521.c # minimum and maximum long signed values my $minlong = "LONG_MIN"; diff --git a/tests/libtest/test.h b/tests/libtest/test.h index bb1acca0e..90735d272 100644 --- a/tests/libtest/test.h +++ b/tests/libtest/test.h @@ -31,7 +31,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #ifdef HAVE_SYS_SELECT_H /* since so many tests use select(), we can just as well include it here */ diff --git a/tests/libtest/test1022.pl b/tests/libtest/test1022.pl index 377808c73..76a11cfe7 100755 --- a/tests/libtest/test1022.pl +++ b/tests/libtest/test1022.pl @@ -24,7 +24,7 @@ $_ = <CURLCONFIG>; chomp; my $filever=$_; if ( $what eq "version" ) { - if($filever =~ /^libcurl ([\.\d]+((-DEV)|(-\d+))?)$/) { + if($filever =~ /^libgnurl ([\.\d]+((-DEV)|(-\d+))?)$/) { $curlconfigversion = $1; } else { diff --git a/tests/libtest/testutil.c b/tests/libtest/testutil.c index f3ad0ce58..78b1a2b65 100644 --- a/tests/libtest/testutil.c +++ b/tests/libtest/testutil.c @@ -20,7 +20,7 @@ * ***************************************************************************/ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "testutil.h" #include "memdebug.h" diff --git a/tests/manpage-scan.pl b/tests/manpage-scan.pl index b6864c857..62eaebea1 100755 --- a/tests/manpage-scan.pl +++ b/tests/manpage-scan.pl @@ -43,7 +43,7 @@ use warnings; my $root=$ARGV[0] || "."; my $buildroot=$ARGV[1] || "."; my $syms = "$root/docs/libcurl/symbols-in-versions"; -my $curlh = "$root/include/curl/curl.h"; +my $curlh = "$root/include/gnurl/curl.h"; my $errors=0; # the prepopulated alias list is the CURLINFO_* defines that are used for the @@ -126,9 +126,9 @@ while(<R>) { } close(R); -scanmanpage("$root/docs/libcurl/curl_easy_setopt.3", @curlopt); -scanmanpage("$root/docs/libcurl/curl_easy_getinfo.3", @curlinfo); -scanmanpage("$root/docs/libcurl/curl_multi_setopt.3", @curlmopt); +scanmanpage("$root/docs/libcurl/gnurl_easy_setopt.3", @curlopt); +scanmanpage("$root/docs/libcurl/gnurl_easy_getinfo.3", @curlinfo); +scanmanpage("$root/docs/libcurl/gnurl_multi_setopt.3", @curlmopt); # using this hash array, we can whitelist specific options my %opts = ( @@ -198,7 +198,7 @@ close(R); ######################################################################### # parse the curl.1 man page, extract all documented command line options # The man page may or may not be rebuilt, so check both possible locations -open(R, "<$buildroot/docs/curl.1") || open(R, "<$root/docs/curl.1") || +open(R, "<$buildroot/docs/gnurl.1") || open(R, "<$root/docs/gnurl.1") || die "no input file"; my @manpage; # store all parsed parameters while(<R>) { @@ -270,10 +270,10 @@ foreach my $o (keys %opts) { $missing=" tool_getparam.c"; } if($where & 2) { - $exists.= " curl.1"; + $exists.= " gnurl.1"; } else { - $missing.= " curl.1"; + $missing.= " gnurl.1"; } if($where & 4) { $exists .= " tool_help.c"; diff --git a/tests/negtelnetserver.py b/tests/negtelnetserver.py.in index f2f2ab500..1d9459926 100755 --- a/tests/negtelnetserver.py +++ b/tests/negtelnetserver.py.in @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!AWKPYTHON # -*- coding: utf-8 -*- # """ A telnet server which negotiates""" diff --git a/tests/nroff-scan.pl b/tests/nroff-scan.pl index 6121d4c8e..c868dd622 100755 --- a/tests/nroff-scan.pl +++ b/tests/nroff-scan.pl @@ -66,7 +66,7 @@ sub file { print STDERR "error: $f:$line: missing \\fP after $str\n"; $errors++; } - if($str =~ /((libcurl|curl)([^ ]*))\(3\)/i) { + if($str =~ /((libcurl|gnurl)([^ ]*))\(3\)/i) { my $man = "$1.3"; if(!manpresent($man)) { print STDERR "error: $f:$line: referring to non-existing man page $man\n"; @@ -78,13 +78,13 @@ sub file { } } } - if($l =~ /(curl([^ ]*)\(3\))/i) { + if($l =~ /(gnurl([^ ]*)\(3\))/i) { print STDERR "error: $f:$line: non-referencing $1\n"; $errors++; } if($l =~ /^\.BR (.*)/) { my $i= $1; - while($i =~ s/((lib|)curl([^ ]*)) *\"\(3\)(,|) *\" *//i ) { + while($i =~ s/((lib|)gnurl([^ ]*)) *\"\(3\)(,|) *\" *//i ) { my $man = "$1.3"; if(!manpresent($man)) { print STDERR "error: $f:$line: referring to non-existing man page $man\n"; diff --git a/tests/runtests.pl b/tests/runtests.pl index 9413f0d41..0bb9605ac 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -150,7 +150,7 @@ my $SMBSPORT; # SMBS server port my $NEGTELNETPORT; # TELNET server port with negotiation my $srcdir = $ENV{'srcdir'} || '.'; -my $CURL="../src/curl".exe_ext(); # what curl executable to run on the tests +my $CURL="../src/gnurl".exe_ext(); # what curl executable to run on the tests my $VCURL=$CURL; # what curl binary to use to verify the servers with # VCURL is handy to set to the system one when the one you # just built hangs or crashes and thus prevent verification @@ -166,7 +166,7 @@ my $PROXYIN="$LOGDIR/proxy.input"; # what curl sent the proxy my $CURLLOG="$LOGDIR/curl.log"; # all command lines run my $FTPDCMD="$LOGDIR/ftpserver.cmd"; # copy ftp server instructions here my $SERVERLOGS_LOCK="$LOGDIR/serverlogs.lock"; # server logs advisor read lock -my $CURLCONFIG="../curl-config"; # curl-config from current build +my $CURLCONFIG="../gnurl-config"; # curl-config from current build # Normally, all test cases should be run, but at times it is handy to # simply run a particular one: diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt index 78b9b7029..2fd861019 100644 --- a/tests/server/CMakeLists.txt +++ b/tests/server/CMakeLists.txt @@ -11,7 +11,7 @@ function(SETUP_EXECUTABLE 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/curl.h" + ${CURL_BINARY_DIR}/include # To be able to reach "gnurl/curl.h" ) if(USE_ARES) include_directories(${CARES_INCLUDE_DIR}) diff --git a/tests/smbserver.py b/tests/smbserver.py.in index 474e0612b..8a4fba8a0 100755 --- a/tests/smbserver.py +++ b/tests/smbserver.py.in @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!AWKPYTHON # -*- coding: utf-8 -*- # # Project ___| | | | _ \| | diff --git a/tests/symbol-scan.pl b/tests/symbol-scan.pl index 6706aa707..cfaffa792 100755 --- a/tests/symbol-scan.pl +++ b/tests/symbol-scan.pl @@ -51,9 +51,9 @@ my $root=$ARGV[0] || "."; # need an include directory when building out-of-tree my $i = ($ARGV[1]) ? "-I$ARGV[1] " : ''; -my $h = "$root/include/curl/curl.h"; -my $mh = "$root/include/curl/multi.h"; -my $ua = "$root/include/curl/urlapi.h"; +my $h = "$root/include/gnurl/curl.h"; +my $mh = "$root/include/gnurl/multi.h"; +my $ua = "$root/include/gnurl/urlapi.h"; my $verbose=0; my $summary=0; diff --git a/tests/testcurl.pl b/tests/testcurl.pl index 69722fb36..5000253c3 100755 --- a/tests/testcurl.pl +++ b/tests/testcurl.pl @@ -503,8 +503,8 @@ if ($git) { } # Set timestamp to the one in curlver.h if this isn't a git test build. -if ((-f "include/curl/curlver.h") && - (open(F, "<include/curl/curlver.h"))) { +if ((-f "include/gnurl/curlver.h") && + (open(F, "<include/gnurl/curlver.h"))) { while (<F>) { chomp; if ($_ =~ /^\#define\s+LIBCURL_TIMESTAMP\s+\"(.+)\".*$/) { diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt index 4b0cec4a8..134462733 100644 --- a/tests/unit/CMakeLists.txt +++ b/tests/unit/CMakeLists.txt @@ -30,7 +30,7 @@ include_directories( ${CURL_SOURCE_DIR}/tests/libtest ${CURL_SOURCE_DIR}/src ${CURL_BINARY_DIR}/lib # To be able to reach "curl_config.h" - ${CURL_BINARY_DIR}/include # To be able to reach "curl/curl.h" + ${CURL_BINARY_DIR}/include # To be able to reach "gnurl/curl.h" ) foreach(_testfile ${UT_SRC}) diff --git a/tests/unit/Makefile.inc b/tests/unit/Makefile.inc index f3cba1c2a..67de815c0 100644 --- a/tests/unit/Makefile.inc +++ b/tests/unit/Makefile.inc @@ -48,7 +48,7 @@ unit1330_CPPFLAGS = $(AM_CPPFLAGS) unit1394_SOURCES = unit1394.c $(UNITFILES) unit1394_CPPFLAGS = $(AM_CPPFLAGS) $(LIBMETALINK_CPPFLAGS) -unit1394_LDADD = @LIBMETALINK_LIBS@ $(top_builddir)/lib/libcurl.la @LIBCURL_LIBS@ +unit1394_LDADD = @LIBMETALINK_LIBS@ $(top_builddir)/lib/libgnurl.la @LIBCURL_LIBS@ unit1394_LDFLAGS = @LIBMETALINK_LDFLAGS@ $(top_builddir)/src/libcurltool.la unit1394_LIBS = @@ -102,7 +102,7 @@ unit1620_CPPFLAGS = $(AM_CPPFLAGS) unit1621_SOURCES = unit1621.c $(UNITFILES) unit1621_CPPFLAGS = $(AM_CPPFLAGS) -unit1621_LDADD = $(top_builddir)/src/libcurltool.la $(top_builddir)/lib/libcurl.la +unit1621_LDADD = $(top_builddir)/src/libcurltool.la $(top_builddir)/lib/libgnurl.la unit1650_SOURCES = unit1650.c $(UNITFILES) unit1650_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/tests/unit/unit1308.c b/tests/unit/unit1308.c index ac41c9d4a..27624a648 100644 --- a/tests/unit/unit1308.c +++ b/tests/unit/unit1308.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "curlcheck.h" -#include <curl/curl.h> +#include <gnurl/curl.h> static CURLcode unit_setup(void) { diff --git a/tests/unit/unit1398.c b/tests/unit/unit1398.c index 8b132a0d7..b29bc0830 100644 --- a/tests/unit/unit1398.c +++ b/tests/unit/unit1398.c @@ -21,7 +21,7 @@ ***************************************************************************/ #include "curlcheck.h" -#include "curl/mprintf.h" +#include "gnurl/mprintf.h" static CURLcode unit_setup(void) {return CURLE_OK;} static void unit_stop(void) {} |