diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/data/test1013 | 2 | ||||
| -rw-r--r-- | tests/data/test1014 | 2 | ||||
| -rw-r--r-- | tests/data/test1022 | 2 | ||||
| -rw-r--r-- | tests/data/test1023 | 2 | ||||
| -rw-r--r-- | tests/libtest/Makefile.am | 10 | ||||
| -rwxr-xr-x | tests/libtest/test1022.pl | 4 | ||||
| -rwxr-xr-x | tests/runtests.pl | 4 |
7 files changed, 14 insertions, 12 deletions
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/libtest/Makefile.am b/tests/libtest/Makefile.am index 80707b165..86bc09132 100644 --- a/tests/libtest/Makefile.am +++ b/tests/libtest/Makefile.am @@ -59,16 +59,16 @@ CFLAG_CURL_SYMBOL_HIDING = @CFLAG_CURL_SYMBOL_HIDING@ 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@ -TESTUTIL_LIBS = $(top_builddir)/lib/libcurl.la @CURL_NETWORK_AND_TIME_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 overriden) LDADD = $(SUPPORTFILES_LIBS) -DEPENDENCIES = $(top_builddir)/lib/libcurl.la +DEPENDENCIES = $(top_builddir)/lib/libgnurl.la # Makefile.inc provides the source defines (TESTUTIL, SUPPORTFILES, # noinst_PROGRAMS, lib*_SOURCES, and lib*_CFLAGS) diff --git a/tests/libtest/test1022.pl b/tests/libtest/test1022.pl index 377808c73..df088c314 100755 --- a/tests/libtest/test1022.pl +++ b/tests/libtest/test1022.pl @@ -12,6 +12,8 @@ my $what=$ARGV[2]; open(CURL, "$ARGV[1]") || die "Can't open curl --version list in $ARGV[1]\n"; $_ = <CURL>; chomp; +# Leave the version to contain libcurl here as we use the ../src/curl binary and +# it is producting "libcurl" string /libcurl\/([\.\d]+((-DEV)|(-\d+))?)/; my $version = $1; close CURL; @@ -24,7 +26,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/runtests.pl b/tests/runtests.pl index 846687cb3..f1c611c8b 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -144,7 +144,7 @@ my $HTTPPIPEPORT; # HTTP pipelining port my $HTTPUNIXPATH; # HTTP server Unix domain socket path 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 @@ -160,7 +160,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: |