Merge branch 'master' of https://github.com/mono/mono into issue4328

[mono.git] / mono / profiler / ptestrunner.pl

diff --git a/mono/profiler/ptestrunner.pl b/mono/profiler/ptestrunner.pl
index a26ec51d494d9e4440ba680385a3be2383fd0e59..36ae39ec5322b1b80d86e968a39712ab0d2a39c0 100755 (executable)
--- a/mono/profiler/ptestrunner.pl
+++ b/mono/profiler/ptestrunner.pl
@@ -108,10 +108,10 @@ exit ($total_errors? 1: 0);
 sub append_path {
        my $var = shift;
        my $value = shift;
-       if (exists $ENV {$var}) {
-               $ENV {$var} = $value . ";" . $ENV {$var};
+       if (exists $ENV{$var}) {
+               $ENV{$var} = $value . ":" . $ENV{$var};
        } else {
-               $ENV {$var} = $value;
+               $ENV{$var} = $value;
        }
 }
 
@@ -226,7 +226,7 @@ sub check_call_traces
        foreach my $method (keys %calls) {
                my @desc = @{$calls{$method}};
                my $num = shift @desc;
-               my $trace = get_delim_data ($section, "\\s+\\d+\\s+\\d+\\s+\\d+\\s+\Q$method\E", "^\\s*\\d+\\s+\\d");
+               my $trace = get_delim_data ($section, "\\s+\\d+\\s+\\d+\\s+\\d+\\s+\Q$method\E", "^(\\s*\\d+\\s+\\d)|(^Total calls)");
                if ($trace =~ s/^\s+(\d+)\s+calls from:$//m) {
                        my $num_calls = $1;
                        push @errors, "Wrong calls to $method." unless $num_calls == $num;
@@ -250,7 +250,7 @@ sub check_alloc_traces
        foreach my $type (keys %types) {
                my @desc = @{$types{$type}};
                my $num = shift @desc;
-               my $trace = get_delim_data ($section, "\\s+\\d+\\s+\\d+\\s+\\d+\\s+\Q$type\E", "^\\s*\\d+\\s+\\d");
+               my $trace = get_delim_data ($section, "\\s+\\d+\\s+\\d+\\s+\\d+\\s+\Q$type\E", "^(\\s*\\d+\\s+\\d)|(^Total)");
                if ($trace =~ s/^\s+(\d+)\s+bytes from:$//m) {
                        #my $num_calls = $1;
                        #push @errors, "Wrong calls to $method." unless $num_calls == $num;