diff options
| -rw-r--r-- | Jamrules.jam | 5 | ||||
| -rw-r--r-- | tests/autotest-local.pl | 7 | ||||
| -rw-r--r-- | tests/autotest-report.pl | 18 |
3 files changed, 23 insertions, 7 deletions
diff --git a/Jamrules.jam b/Jamrules.jam index 39f0daa..3575406 100644 --- a/Jamrules.jam +++ b/Jamrules.jam @@ -673,7 +673,8 @@ else exit "Unknown toolset $(toolset)!" ; } -COVSUCCESS = "echo $" "(COVPREFIX) success" ; +RUNRESULT = "success" ; +COVSUCCESS = "echo $" "(COVPREFIX) $" "(RUNRESULT)" ; if ( $(toolset:I=^mingw) || $(toolset:I=^gcc) ) { @@ -718,6 +719,8 @@ else { if ( $(toolset:I=(^xbox360|^ps3|wince|^bada$)) ) { + RUNRESULT = "skiprun" ; + actions RunAction { } diff --git a/tests/autotest-local.pl b/tests/autotest-local.pl index cd89f22..fd81be0 100644 --- a/tests/autotest-local.pl +++ b/tests/autotest-local.pl @@ -34,7 +34,7 @@ sub getcpucount undef; } -@alltoolsets = ($^O =~ /MSWin/) ? (bcc, cw, dmc, ic8, ic9, ic9_x64, ic10, ic10_x64, ic11, ic11_x64, mingw34, mingw44, mingw45, mingw45_0x, mingw46_x64, msvc6, msvc7, msvc71, msvc8, msvc8_x64, msvc9, msvc9_x64, msvc10, msvc10_x64, msvc10_clr, msvc10_clr_x64, xbox360, ps3_gcc, ps3_snc, msvc8_wince) : ($^O =~ /solaris/) ? (suncc, suncc_x64) : &gcctoolset(); +@alltoolsets = ($^O =~ /MSWin/) ? (bcc, cw, dmc, ic8, ic9, ic9_x64, ic10, ic10_x64, ic11, ic11_x64, mingw34, mingw44, mingw45, mingw45_0x, mingw46_x64, msvc6, msvc7, msvc71, msvc8, msvc8_x64, msvc9, msvc9_x64, msvc10, msvc10_x64, msvc10_clr, msvc10_clr_x64, xbox360, ps3_gcc, ps3_snc, msvc8_wince, bada) : ($^O =~ /solaris/) ? (suncc, suncc_x64) : &gcctoolset(); $fast = scalar grep(/^fast$/, @ARGV); @toolsets = map { /^fast$/ ? () : ($_) } @ARGV; @@ -101,12 +101,13 @@ foreach $toolset (@toolsets) while (<PIPE>) { # ... autotest release [wchar] success - if (/^\.\.\. autotest (\S+) \[(.*?)\] success/) + if (/^\.\.\. autotest (\S+) \[(.*?)\] (success|skiprun)/) { my $configuration = $1; my $defineset = ($2 eq $stddefine) ? '' : $2; + my $result = $3; - print "### autotest $Config{archname} $toolset $configuration [$defineset] success\n"; + print "### autotest $Config{archname} $toolset $configuration [$defineset] $result\n"; } # ... autotest release [wchar] gcov elsif (/^\.\.\. autotest (\S+) \[(.*?)\] gcov/) diff --git a/tests/autotest-report.pl b/tests/autotest-report.pl index 4b4bd8a..360fa84 100644 --- a/tests/autotest-report.pl +++ b/tests/autotest-report.pl @@ -34,6 +34,8 @@ sub prettytoolset return "Sony PlayStation3 GCC" if ($toolset =~ /^ps3_gcc/); return "Sony PlayStation3 SNC" if ($toolset =~ /^ps3_snc/); + return "BadaSDK (GCC)" if ($toolset =~ /^bada$/); + $toolset; } @@ -54,6 +56,8 @@ sub prettyplatform return "x360" if ($toolset =~ /^xbox360/); return "ps3" if ($toolset =~ /^ps3/); + return "arm" if ($toolset =~ /^bada/); + return "win64" if ($platform =~ /MSWin32-x64/); return "win32" if ($platform =~ /MSWin32/); @@ -93,11 +97,15 @@ while (<>) if ($info =~ /^prepare/) { - $results{$fulltool}{$fullconf}{result} = 1; + $results{$fulltool}{$fullconf}{result} = ""; } elsif ($info =~ /^success/) { - $results{$fulltool}{$fullconf}{result} = 0; + $results{$fulltool}{$fullconf}{result} = "success"; + } + elsif ($info =~ /^skiprun/) + { + $results{$fulltool}{$fullconf}{result} = "skiprun"; } elsif ($info =~ /^coverage (\S+)/) { @@ -178,7 +186,7 @@ foreach $tool (@toolsetarray) { print "<td bgcolor='#cccccc'> </td>"; } - elsif ($$info{result} == 0) + elsif ($$info{result} eq "success") { my $coverage = $$info{coverage}; @@ -191,6 +199,10 @@ foreach $tool (@toolsetarray) print "</td>"; } + elsif ($$info{result} eq "skiprun") + { + print "<td bgcolor='#ffff80' align='center'>pass</td>" + } else { print "<td bgcolor='#ff0000' align='center'>fail</td>" |