diff options
| author | Jan Kneschke <jan@kneschke.de> | 2005-08-29 12:08:00 +0000 |
|---|---|---|
| committer | Jan Kneschke <jan@kneschke.de> | 2005-08-29 12:08:00 +0000 |
| commit | 15b010907193c23e7d89918e74b90ff36e21bab9 (patch) | |
| tree | 0e4a1018cb091b600a5cde3bbadb8390f0534f82 /tests/LightyTest.pm | |
| parent | 0f30ffa1450b6b062e9b50f3d7d59a4d0fe1fa6b (diff) | |
| download | lighttpd-git-15b010907193c23e7d89918e74b90ff36e21bab9.tar.gz | |
run tests in build root (merged #228)
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-merge-1.4.x@640 152afb58-edef-0310-8abb-c4023f1b3aa9
Diffstat (limited to 'tests/LightyTest.pm')
| -rwxr-xr-x | tests/LightyTest.pm | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/tests/LightyTest.pm b/tests/LightyTest.pm index 2fade4c7..0578a7f8 100755 --- a/tests/LightyTest.pm +++ b/tests/LightyTest.pm @@ -8,14 +8,23 @@ use Test::More; sub new { my $class = shift; my $self = {}; + my $lpath; $self->{CONFIGFILE} = 'lighttpd.conf'; - $self->{BASEDIR} = (defined $ENV{'top_builddir'} ? $ENV{'top_builddir'} : '..'); - $self->{SRCDIR} = (defined $ENV{'srcdir'} ? $ENV{'srcdir'} : '.'); + + $lpath = (defined $ENV{'top_builddir'} ? $ENV{'top_builddir'} : '..'); + $lpath = `readlink -f '$lpath'`; + chomp $lpath; + $self->{BASEDIR} = $lpath; + + $lpath = (defined $ENV{'srcdir'} ? $ENV{'srcdir'} : '.'); +# $lpath = `readlink -f '$lpath'`; +# chomp $lpath; + $self->{SRCDIR} = $lpath; $self->{LIGHTTPD_PATH} = $self->{BASEDIR}.'/src/lighttpd'; - $self->{LIGHTTPD_PIDFILE} = '/tmp/lighttpd/lighttpd.pid'; - $self->{PIDOF_PIDFILE} = '/tmp/lighttpd/pidof.pid'; + $self->{LIGHTTPD_PIDFILE} = $self->{SRCDIR}.'/tmp/lighttpd/lighttpd.pid'; + $self->{PIDOF_PIDFILE} = $self->{SRCDIR}.'/tmp/lighttpd/pidof.pid'; $self->{PORT} = 2048; bless($self, $class); @@ -63,24 +72,22 @@ sub start_proc { # pre-process configfile if necessary # - my $pwd = `pwd`; - chomp($pwd); - unlink("/tmp/cfg.file"); - system("cat ".$self->{SRCDIR}."/".$self->{CONFIGFILE}.' | perl -pe "s#\@SRCDIR\@#'.$pwd.'/'.$self->{BASEDIR}.'/tests/#" > /tmp/cfg.file'); + unlink($self->{SRCDIR}."/tmp/cfg.file"); + system("cat ".$self->{SRCDIR}."/".$self->{CONFIGFILE}.' | perl -pe "s#\@SRCDIR\@#'.$self->{BASEDIR}.'/tests/#" > '.$self->{SRCDIR}.'/tmp/cfg.file'); unlink($self->{LIGHTTPD_PIDFILE}); if (1) { - system($self->{LIGHTTPD_PATH}." -f /tmp/cfg.file"); + system($self->{LIGHTTPD_PATH}." -f ".$self->{SRCDIR}."/tmp/cfg.file -m ".$self->{BASEDIR}."/src/.libs"); select(undef, undef, undef, 0.1); } else { - system("valgrind --tool=memcheck --show-reachable=yes --leak-check=yes --logfile=foo ".$self->{LIGHTTPD_PATH}." -D -f /tmp/cfg.file &"); + system("valgrind --tool=memcheck --show-reachable=yes --leak-check=yes --logfile=foo ".$self->{LIGHTTPD_PATH}." -D -f ".$self->{SRCDIR}."/tmp/cfg.file -m ".$self->{BASEDIR}."/src/.libs &"); select(undef, undef, undef, 2); } # sleep(1); - unlink("/tmp/cfg.file"); + unlink($self->{SRCDIR}."/tmp/cfg.file"); # no pidfile, we failed if (not -e $self->{LIGHTTPD_PIDFILE}) { |