launching the tests
--setenv var=value : set a specific environment variable
--cfg arg : add parameter --cfg=arg to each command line
+ --log arg : add parameter --log=arg to each command line
--enable-coverage : ignore output lines starting with "profiling:"
=head1 TEST SUITE FILE SYTAX
The solution is to prefix each line of your output with temporal
information so that lines can be grouped by timestamps. The
-lexicographical sort then only applies to lines that occured at the
+lexicographical sort then only applies to lines that occurred at the
same timestamp. Here is a SimGrid example:
# Sort only lines depending on the first 19 chars
'timeout=s' => \$opts{'timeout'},
'setenv=s' => sub { setenv_cmd( $_[1] ) },
'cfg=s' => sub { $opts{'cfg'} .= " --cfg=$_[1]" },
+ 'log=s' => sub { $opts{'log'} .= " --log=$_[1]" },
'enable-coverage+' => \$enable_coverage,
);
}
# substitute remaining variables, if any
- while ( $cmd{'cmd'} =~ /\${(\w+)(?::[=-][^}]*)?}/ ) {
+ while ( $cmd{'cmd'} =~ /\$\{(\w+)(?::[=-][^}]*)?\}/ ) {
$cmd{'cmd'} = var_subst( $cmd{'cmd'}, $1, "" );
}
while ( $cmd{'cmd'} =~ /\$(\w+)/ ) {
$cmd{'cmd'} = var_subst( $cmd{'cmd'}, $1, "" );
}
- # add cfg options
+ # add cfg and log options
$cmd{'cmd'} .= " $opts{'cfg'}"
if ( defined( $opts{'cfg'} ) && length( $opts{'cfg'} ) );
+ $cmd{'cmd'} .= " $opts{'log'}"
+ if ( defined( $opts{'log'} ) && length( $opts{'log'} ) );
# finally trim any remaining space chars
$cmd{'cmd'} =~ s/^\s+//;
###
# exec the command line
- my @cmdline = quotewords( '\s+', 0, $cmd{'cmd'} );
+ my @cmdline;
+ if(defined $ENV{VALGRIND_COMMAND}) {
+ push @cmdline, $ENV{VALGRIND_COMMAND};
+ push @cmdline, split(" ", $ENV{VALGRIND_OPTIONS});
+ if($cmd{'timeout'} ne 'no'){
+ $cmd{'timeout'}=$cmd{'timeout'}*20
+ }
+ }
+ push @cmdline, quotewords( '\s+', 0, $cmd{'cmd'} );
my $input = defined($cmd{'in'})? join("\n",@{$cmd{'in'}}) : "";
my $output = " " x 10240; $output = ""; # Preallocate 10kB, and reset length to 0
$cmd{'got'} = \$output;
eval {
finish( $cmd{'job'} );
};
- if ($@) { # deal with the errors that occured in the child process
+ if ($@) { # deal with the errors that occurred in the child process
if ($@ =~ /timeout/) {
$cmd{'job'}->kill_kill;
$cmd{'timeouted'} = 1;
sub var_subst {
my ( $text, $name, $value ) = @_;
if ($value) {
- $text =~ s/\${$name(?::[=-][^}]*)?}/$value/g;
+ $text =~ s/\$\{$name(?::[=-][^}]*)?\}/$value/g;
$text =~ s/\$$name(\W|$)/$value$1/g;
} else {
- $text =~ s/\${$name:=([^}]*)}/$1/g;
- $text =~ s/\${$name}//g;
+ $text =~ s/\$\{$name:=([^}]*)\}/$1/g;
+ $text =~ s/\$\{$name\}//g;
$text =~ s/\$$name(\W|$)/$1/g;
}
return $text;
# Command setenv. Gets "variable=content", and update the environment accordingly
sub setenv_cmd($) {
my $arg = shift;
- if ( $arg =~ /^(.*)=(.*)$/ ) {
+ if ( $arg =~ /^(.*?)=(.*)$/ ) {
my ( $var, $ctn ) = ( $1, $2 );
print "[Tesh/INFO] setenv $var=$ctn\n";
$environ{$var} = $ctn;