Commit c9bc14a2 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

use the pid file, use the automake subdir

parent 63708cbf

tests/Makefile.am

+5 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ EXTRA_DIST = ftpserver.pl httpserver.pl httpsserver.pl runtests.pl \ 
	     ftpsserver.pl stunnel.pm getpart.pm FILEFORMAT README \

	     stunnel.pem



SUBDIRS = data

SUBDIRS = data server



PERLFLAGS = -I$(srcdir)
@@ -12,11 +12,11 @@ install: 
curl:

	@(cd ..; make)



test:

test: server/sws

	@cd data && exec $(MAKE) test

	srcdir=$(srcdir) $(PERL) $(PERLFLAGS) $(srcdir)/runtests.pl



quiet-test:

quiet-test: server/sws

	@cd data && exec $(MAKE) test

	srcdir=$(srcdir) $(PERL) $(PERLFLAGS) $(srcdir)/runtests.pl -s -a
@@ -24,3 +24,5 @@ clean: 
	rm -rf log

	find . -name "*~" | xargs rm -f



server/sws:

	cd server; make sws

tests/runtests.pl

+6 −2
Original line number Diff line number Diff line
@@ -140,14 +140,18 @@ sub runhttpserver { 
    my $RUNNING;

    my $pid;



    $pid = checkserver ($HTTPPIDFILE);



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

    my $data=`$CURL --silent -i $HOSTIP:$HOSTPORT/verifiedserver`;



    if ( $data =~ /WE ROOLZ(: |)(\d*)/ ) {

        if($2) {

            $pid = 0+$2;

        }



        if(!$pid) {

            print "Test server already running with unkown pid! Use it...\n";

            print "Test server already running with unknown pid! Use it...\n";

            return;

        }