Added %CLIENTIP and %CLIENT6IP data file substitution variables.

the client/stdout section is used.

Available substitute variables include:

%HOSTIP    - IPv6 address of the host running this test

%CLIENTIP   - IPv4 address of the client running curl

%CLIENT6IP  - IPv6 address of the client running curl

%HOSTIP    - IPv4 address of the host running this test

%HOSTPORT  - Port number of the HTTP server

%HOST6IP   - IPv6 address of the host running this test

%HOST6PORT - IPv6 port number of the HTTP server

#

# $Id$

###########################################################################

# Experimental hooks are available to run tests remotely on machines that

# are able to run curl but are unable to run the test harness.  

# The following sections need to be modified:

#  $HOSTIP, $HOST6IP - Set to the address of the host running the test suite

#  $CLIENTIP, $CLIENT6IP - Set to the address of the host running curl

#  checktestcmd - Modify to check the remote system's PATH (only needed

#    if -g is given, or -n is NOT given)

#  runcurl - Modify to copy all the files in the log/ directory to the

#    system running curl, run the given command remotely and save the

#    return code, then copy all the files from the remote system's log/

#    directory back to the host running the test suite.  This can be

#    done a few ways, such as using scp & ssh, or rsync & telnet.

# Note that even with these changes a number of tests will still fail

# (mainly to do with cookies or authentication) due to hard-coded

# addresses within various protocol fields.

# These should be the only variables that might be needed to get edited:

use strict;

require "valgrind.pm"; # valgrind report parser

require "ftp.pm";

my $srcdir = $ENV{'srcdir'} || '.';

my $HOSTIP="127.0.0.1";

my $HOST6IP="[::1]";

my $HOSTIP="127.0.0.1";   # address on which the test server listens

my $HOST6IP="[::1]";      # address on which the test server listens

my $CLIENTIP="127.0.0.1"; # address which curl uses for incoming connections

my $CLIENT6IP="[::1]";    # address which curl uses for incoming connections

my $base = 8990; # base port number

my $SSHPORT; # SCP/SFTP

my $SOCKSPORT; # SOCKS4/5 port

my $srcdir = $ENV{'srcdir'} || '.';

my $CURL="../src/curl"; # what curl executable to run on the tests

my $DBGCURL=$CURL; #"../src/.libs/curl";  # alternative for debugging

my $LOGDIR="log";

my $memanalyze="$perl $srcdir/memanalyze.pl";

my $stunnel = checkcmd("stunnel4") || checkcmd("stunnel");

my $valgrind = checkcmd("valgrind");

my $valgrind = checktestcmd("valgrind");

my $valgrind_logfile="--logfile";

my $start;

my $forkserver=0;

if($valgrind) {

    # since valgrind 2.1.x, '--tool' option is mandatory

    # use it, if it is supported by the version installed on the system

    system("valgrind --help 2>&1 | grep -- --tool > /dev/null 2>&1");

    runcurl("valgrind --help 2>&1 | grep -- --tool > /dev/null 2>&1");

    if (($? >> 8)==0) {

        $valgrind_tool="--tool=memcheck ";

    }

    }

}

my $gdb = checkcmd("gdb");

my $gdb = checktestcmd("gdb");

my $ssl_version; # set if libcurl is built with SSL support

my $large_file;  # set if libcurl is built with large file support

#######################################################################

# Check for a command in the PATH.

# Check for a command in the PATH of the test server.

#

sub checkcmd {

    my ($cmd)=@_;

    }

}

#######################################################################

# Check for a command in the PATH of the machine running curl.

#

sub checktestcmd {

    my ($cmd)=@_;

    return checkcmd($cmd);

}

#######################################################################

# Run the application under test

#

sub runcurl {

    my ($cmd)=@_;

    return system($cmd);

}

#######################################################################

# Memory allocation test and failure torture testing.

#

    unlink($memdump);

    # First get URL from test server, ignore the output/result

    system($testcmd);

    runcurl($testcmd);

    logmsg " CMD: $testcmd\n" if($verbose);

        my $ret;

        if($gdbthis) {

            system($gdbline)

            runcurl($gdbline)

        }

        else {

            $ret = system($testcmd);

            $ret = runcurl($testcmd);

        }

        # Now clear the variable again

    # verify if our/any server is running on this port

    logmsg "CMD; $cmd\n" if ($verbose);

    my $res = system($cmd);

    my $res = runcurl($cmd);

    $res >>= 8; # rotate the result

    my $data;

    }

    my $flag=$debugprotocol?"-v ":"";

    my $cmd="$perl $srcdir/sshserver.pl $flag-u $USER -d $srcdir $port";

    my $cmd="$perl $srcdir/sshserver.pl $flag-u $USER -l $HOSTIP -d $srcdir $port";

    my ($sshpid, $pid2) =

        startnew($cmd, $pidfile,0); # start the server in a new process

    unlink($curlverout);

    unlink($curlvererr);

    $versretval = system($versioncmd);

    $versretval = runcurl($versioncmd);

    $versnoexec = $!;

    open(VERSOUT, "<$curlverout");

  $$thing =~ s/%SOCKSPORT/$SOCKSPORT/g;

  $$thing =~ s/%CURL/$CURL/g;

  $$thing =~ s/%USER/$USER/g;

  $$thing =~ s/%CLIENTIP/$CLIENTIP/g;

  $$thing =~ s/%CLIENT6IP/$CLIENT6IP/g;

  # The purpose of FTPTIME2 and FTPTIME3 is to provide times that can be

  # used for time-out tests and that whould work on most hosts as these

                       "$gdb --directory libtest $DBGCURL -x log/gdbcmd");

    }

    elsif($gdbthis) {

        system("$gdb --directory libtest $DBGCURL -x log/gdbcmd");

        runcurl("$gdb --directory libtest $DBGCURL -x log/gdbcmd");

        $cmdres=0; # makes it always continue after a debugged run

    }

    else {

        $cmdres = system("$CMDLINE");

        $cmdres = runcurl("$CMDLINE");

        my $signal_num  = $cmdres & 127;

        $dumped_core = $cmdres & 128;

            open(GDBCMD, ">log/gdbcmd2");

            print GDBCMD "bt\n";

            close(GDBCMD);

            system("$gdb --directory libtest -x log/gdbcmd2 -batch $DBGCURL core ");

            runcurl("$gdb --directory libtest -x log/gdbcmd2 -batch $DBGCURL core ");

     #       unlink("log/gdbcmd2");

        }

    }

    chomp $cmd;

    subVariables \$cmd;

    if($cmd) {

	my $rc = system("$cmd");

	my $rc = runcurl("$cmd");

	if($rc != 0) {

	    logmsg "postcheck failure\n";

	    return 1;

    # we have found valgrind on the host, use it

    # verify that we can invoke it fine

    my $code = system("valgrind >/dev/null 2>&1");

    my $code = runcurl("valgrind >/dev/null 2>&1");

    if(($code>>8) != 1) {

        #logmsg "Valgrind failure, disable it\n";