diff options
| author | mOo <moo.lighttpd@gmail.com> | 2005-09-29 17:06:47 +0000 |
|---|---|---|
| committer | mOo <moo.lighttpd@gmail.com> | 2005-09-29 17:06:47 +0000 |
| commit | 1d3da14a5b433a3477ee2cc54c2003d0f0fab26b (patch) | |
| tree | 5558a5c2f9c51afc7013c3c625ef899b2c56378e /tests/LightyTest.pm | |
| parent | 1f855b34dd5bfddcb9007c004fe0e7518ae6052a (diff) | |
| download | lighttpd-git-1d3da14a5b433a3477ee2cc54c2003d0f0fab26b.tar.gz | |
make it works for both autotools/scons
git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-merge-1.4.x@759 152afb58-edef-0310-8abb-c4023f1b3aa9
Diffstat (limited to 'tests/LightyTest.pm')
| -rwxr-xr-x | tests/LightyTest.pm | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/tests/LightyTest.pm b/tests/LightyTest.pm index cd3fae48..5080f7fe 100755 --- a/tests/LightyTest.pm +++ b/tests/LightyTest.pm @@ -7,6 +7,11 @@ use Test::More; use Socket; use Cwd 'abs_path'; +sub mtime { + my $file = shift; + my @stat = stat $file; + return @stat ? $stat[9] : 0; +} sub new { my $class = shift; my $self = {}; @@ -24,7 +29,13 @@ sub new { $self->{SRCDIR} = abs_path($lpath); - $self->{LIGHTTPD_PATH} = $self->{BASEDIR}.'/src/lighttpd'; + if (mtime($self->{BASEDIR}.'/src/lighttpd') > mtime($self->{BASEDIR}.'/build/lighttpd')) { + $self->{LIGHTTPD_PATH} = $self->{BASEDIR}.'/src/lighttpd'; + $self->{MODULES_PATH} = $self->{BASEDIR}.'/src/.libs'; + } else { + $self->{LIGHTTPD_PATH} = $self->{BASEDIR}.'/build/lighttpd'; + $self->{MODULES_PATH} = $self->{BASEDIR}.'/build'; + } $self->{LIGHTTPD_PIDFILE} = $self->{TESTDIR}.'/tmp/lighttpd/lighttpd.pid'; $self->{PIDOF_PIDFILE} = $self->{TESTDIR}.'/tmp/lighttpd/pidof.pid'; $self->{PORT} = 2048; @@ -81,9 +92,9 @@ sub start_proc { unlink($self->{LIGHTTPD_PIDFILE}); if (1) { - system($self->{LIGHTTPD_PATH}." -f ".$self->{TESTDIR}."/tmp/cfg.file -m ".$self->{BASEDIR}."/src/.libs"); + system($self->{LIGHTTPD_PATH}." -f ".$self->{TESTDIR}."/tmp/cfg.file -m ".$self->{MODULES_PATH}); } else { - system("valgrind --tool=memcheck --show-reachable=yes --leak-check=yes --logfile=foo ".$self->{LIGHTTPD_PATH}." -D -f ".$self->{TESTDIR}."/tmp/cfg.file -m ".$self->{BASEDIR}."/src/.libs &"); + system("valgrind --tool=memcheck --show-reachable=yes --leak-check=yes --logfile=foo ".$self->{LIGHTTPD_PATH}." -D -f ".$self->{TESTDIR}."/tmp/cfg.file -m ".$self->{MODULES_PATH}." &"); } select(undef, undef, undef, 0.1); |