diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 8 | ||||
| -rwxr-xr-x | tests/runtests.pl | 8 |
2 files changed, 11 insertions, 5 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 5205ad80f..6d8aff3ea 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -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 diff --git a/tests/runtests.pl b/tests/runtests.pl index 4d18268d6..b88988ac7 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -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*)/ ) { - $pid = 0+$2; + 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; } |