}
my ($proj_dir) = $ARGV[0];
-open MAKETEST, $ARGV[1] or die "Unable to open $ARGV[1]. $!\n";
+open MAKETEST, $ARGV[1] or die "Unable to open file: \"$ARGV[1]\". $!\n";
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 {
my ($line);
my ($path);
my ($dump) = 0;
-my ($srcdir);
-my ($bindir);
+my (%environ);
my ($tesh_file);
my ($config_var);
my ($name_test);
+my ($indent);
while ( defined( $line = <MAKETEST> ) ) {
chomp $line;
last;
}
if ($dump) {
+ $line =~ s/^ //;
if ( $line =~ /^\s*ADD_TEST\(\S+\s+\S*\/tesh\s/ ) {
- $srcdir = "";
- $bindir = "";
+ undef %environ;
$config_var = "";
$path = "";
$nb_test++;
$tesh_file = "";
$name_test = "";
+ $indent = "";
- if ( $line =~ /ADD_TEST\((\S+)/ ) {
- $name_test = ($1);
+ if ( $line =~ /^(\s*)ADD_TEST\((\S+)/ ) {
+ $indent = ($1);
+ $name_test = ($2);
}
while ( $line =~ /--cfg\s+(\S+)/g ) {
$config_var = "--cfg=$1 $config_var";
}
while ( $line =~ /--setenv\s+(\S+)\=(\S+)/g ) {
my ( $env_var, $value_var ) = ( $1, $2 );
- if ( $env_var =~ /srcdir/ ) {
- $srcdir = $value_var;
- }
- elsif ( $env_var =~ /bindir/ ) {
- $bindir = $value_var;
- }
+ $environ{$env_var} = $value_var;
}
if ( $line =~ /(\S+)\)$/ ) {
$tesh_file = $1;
if (0) {
print "test_name = $name_test\n";
- print "$config_var\n";
+ print "config_var = $config_var\n";
print "path = $path\n";
- print "srcdir=$srcdir\n";
- print "bindir=$bindir\n";
+ foreach my $key (keys %environ) {
+ print "$key = $environ{$key}\n";
+ }
print "tesh_file = $tesh_file\n";
print "\n\n";
}
my ($count) = 0;
my ($count_first) = 0;
my ($count_second) = 0;
- open TESH_FILE, $tesh_file or die "Unable to open $tesh_file $!\n";
+ open TESH_FILE, $tesh_file or die "Unable to open tesh file: \"$tesh_file\". $!\n";
+ my ($input) = "";
my ($l);
while ( defined( $l = <TESH_FILE> ) ) {
chomp $l;
+ if ( $l =~ /^< (.*)$/ ) {
+ $input = $input . $1 . "\n";
+ }
if ( $l =~ /^\$ (.*)$/ ) {
my ($command) = $1;
- $command = var_subst($command, "srcdir", $srcdir);
- $command = var_subst($command, "bindir", $bindir);
+ foreach my $key (keys %environ) {
+ $command = var_subst($command, $key, $environ{$key});
+ }
+ # substitute remaining known variables, if any
+ $command = var_subst($command, "srcdir", "");
+ $command = var_subst($command, "bindir", "");
$command = var_subst($command, "EXEEXT", "");
$command = var_subst($command, "SG_TEST_EXENV", "");
$command = var_subst($command, "SG_TEST_ENV", "");
if ($config_var) {
$command = "$command $config_var";
}
- print "ADD_TEST(memcheck-$name_test-$count $command --cd $path\/)\n";
-
+ if ( $command =~ /^mkfile\s+(\S+)/) {
+ my $file = $1;
+ # don't ask me to explain why so many backslashes...
+ $input =~ s/\\/\\\\\\\\\\\\\\\\/g;
+ $input =~ s/\n/\\\\\\\\n/g;
+ $input =~ s/"/\\\\\\\\042/g;
+ $input =~ s/'/\\\\\\\\047/g;
+ $input =~ s/%/%%/g;
+ $command = "sh -c \"printf '$input' > $file\"";
+ }
+ print "${indent}ADD_TEST(memcheck-$name_test-$count $command --cd $path\/)\n";
+ $input = "";
#push @test_list, "memcheck-$name_test-$count";
$count++;
}