Changeset 2179

Show
Ignore:
Timestamp:
05/22/2008 07:17:50 AM (5 months ago)
Author:
moo
Message:

reduce duplicate code for building command line

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/tests/LightyTest.pm

    r2009 r2179  
    9292 
    9393        unlink($self->{LIGHTTPD_PIDFILE}); 
    94         my $cmdline = ""; 
     94        my $cmdargs = "-f ".$self->{SRCDIR}."/".$self->{CONFIGFILE}." -m ".$self->{MODULES_PATH}; 
     95        my $cmdline = $self->{LIGHTTPD_PATH}." ".$cmdargs; 
     96        my $cmdline_nofork = $self->{LIGHTTPD_PATH}." -D ".$cmdargs; 
    9597        if (defined $ENV{"TRACEME"} && $ENV{"TRACEME"} eq 'strace') { 
    96                 $cmdline = "strace -tt -s 512 -o strace ".$self->{LIGHTTPD_PATH}." -D -f ".$self->{SRCDIR}."/".$self->{CONFIGFILE}." -m ".$self->{MODULES_PATH}." &"; 
     98                $cmdline = "strace -tt -s 512 -o strace $cmdline_nofork &"; 
    9799        } elsif (defined $ENV{"TRACEME"} && $ENV{"TRACEME"} eq 'truss') { 
    98                 $cmdline = "truss -a -l -w all -v all -o strace ".$self->{LIGHTTPD_PATH}." -D -f ".$self->{SRCDIR}."/".$self->{CONFIGFILE}." -m ".$self->{MODULES_PATH}." &"; 
     100                $cmdline = "truss -a -l -w all -v all -o strace $cmdline_nofork &"; 
    99101        } elsif (defined $ENV{"TRACEME"} && $ENV{"TRACEME"} eq 'gdb') { 
    100                 $cmdline = "gdb --batch --ex 'run' --ex 'bt' --args ".$self->{LIGHTTPD_PATH}." -D -f ".$self->{SRCDIR}."/".$self->{CONFIGFILE}." -m ".$self->{MODULES_PATH}." > gdb.out &"; 
    101  
     102                $cmdline = "gdb --batch --ex 'run' --ex 'bt' --args $cmdline_nofork &"; 
    102103        } elsif (defined $ENV{"TRACEME"} && $ENV{"TRACEME"} eq 'valgrind') { 
    103                 $cmdline = "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}." &"; 
    104         } else { 
    105                 $cmdline = $self->{LIGHTTPD_PATH}." -f ".$self->{SRCDIR}."/".$self->{CONFIGFILE}." -m ".$self->{MODULES_PATH}; 
     104                $cmdline = "valgrind --tool=memcheck --show-reachable=yes --leak-check=yes --log-file=valgrind $cmdline_nofork &"; 
    106105        } 
    107106        # diag("starting lighttpd at :".$self->{PORT}.", cmdline: ".$cmdline );