← Back to branch summary

~ubuntu-branches/ubuntu/edgy/lighttpd/edgy-security

« back to all changes in this revision

Viewing changes to tests/LightyTest.pm

  • Committer: Bazaar Package Importer
  • Author(s): Lukas Fittl
  • Date: 2006-10-10 13:57:38 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20061010135738-gn4pp1ut1s1g27pb
Tags: 1.4.13~r1370-1ubuntu1
* Merge from Debian unstable (Closes: Malone #64900). Remaining changes:
  - Add an additional dependency on libterm-readline-perl-perl
    (Malone #43895)

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/LightyTest.pm
90
90
        $ENV{'SRCDIR'} = $self->{BASEDIR}.'/tests';
91
91
 
92
92
        unlink($self->{LIGHTTPD_PIDFILE});
93
 
        if (1) {
 
93
        if (defined $ENV{"TRACEME"} && $ENV{"TRACEME"} eq 'strace') {
 
94
                system("strace -tt -s 512 -o strace ".$self->{LIGHTTPD_PATH}." -D -f ".$self->{SRCDIR}."/".$self->{CONFIGFILE}." -m ".$self->{MODULES_PATH}." &");
 
95
        } elsif (defined $ENV{"TRACEME"} && $ENV{"TRACEME"} eq 'valgrind') {
 
96
                system("valgrind --tool=memcheck --show-reachable=yes --leak-check=yes --log-file=valgrind ".$self->{LIGHTTPD_PATH}." -D -f ".$self->{SRCDIR}."/".$self->{CONFIGFILE}." -m ".$self->{MODULES_PATH}." &");
 
97
        } else {
94
98
                system($self->{LIGHTTPD_PATH}." -f ".$self->{SRCDIR}."/".$self->{CONFIGFILE}." -m ".$self->{MODULES_PATH});
95
 
        } else {
96
 
                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}." &");
97
99
        }
98
100
 
99
101
        select(undef, undef, undef, 0.1);
195
197
                        }
196
198
                }
197
199
 
 
200
                $t->{etag} = $resp_hdr{'etag'};
 
201
                $t->{date} = $resp_hdr{'date'};
 
202
 
198
203
                # check length
199
204
                if (defined $resp_hdr{"content-length"}) {
200
205
                        $resp_body = substr($lines, 0, $resp_hdr{"content-length"});