moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

use the pid file, use the automake subdir

Browse Source
This commit is contained in:
Daniel Stenberg 2002-02-25 12:45:20 +00:00
parent 63708cbfb0
commit c9bc14a222
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/Makefile.am
View File

@ -2,7 +2,7 @@ EXTRA_DIST = ftpserver.pl httpserver.pl httpsserver.pl runtests.pl \
ftpsserver.pl stunnel.pm getpart.pm FILEFORMAT README \ ftpsserver.pl stunnel.pm getpart.pm FILEFORMAT README \
stunnel.pem stunnel.pem
SUBDIRS = data SUBDIRS = data server
PERLFLAGS = -I$(srcdir) PERLFLAGS = -I$(srcdir)
@ -12,11 +12,11 @@ install:
curl: curl:
@(cd ..; make) @(cd ..; make)
test: test: server/sws
@cd data && exec $(MAKE) test @cd data && exec $(MAKE) test
srcdir=$(srcdir) $(PERL) $(PERLFLAGS) $(srcdir)/runtests.pl srcdir=$(srcdir) $(PERL) $(PERLFLAGS) $(srcdir)/runtests.pl
quiet-test: quiet-test: server/sws
@cd data && exec $(MAKE) test @cd data && exec $(MAKE) test
srcdir=$(srcdir) $(PERL) $(PERLFLAGS) $(srcdir)/runtests.pl -s -a srcdir=$(srcdir) $(PERL) $(PERLFLAGS) $(srcdir)/runtests.pl -s -a
@ -24,3 +24,5 @@ clean:
rm -rf log rm -rf log
find . -name "*~" | xargs rm -f find . -name "*~" | xargs rm -f
server/sws:
cd server; make sws

8
tests/runtests.pl
View File

@ -140,14 +140,18 @@ sub runhttpserver {
my $RUNNING; my $RUNNING;
my $pid; my $pid;
$pid = checkserver ($HTTPPIDFILE);
# verify if our/any server is running on this port # verify if our/any server is running on this port
my $data=`$CURL --silent -i $HOSTIP:$HOSTPORT/verifiedserver`; my $data=`$CURL --silent -i $HOSTIP:$HOSTPORT/verifiedserver`;
if ( $data =~ /WE ROOLZ(: |)(\d*)/ ) { if ( $data =~ /WE ROOLZ(: |)(\d*)/ ) {
$pid = 0+$2; if($2) {
$pid = 0+$2;
}
if(!$pid) { 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; return;
} }