Skip to content
Snippets Groups Projects
Commit eaac540d authored by arseny.kapoulkine@gmail.com's avatar arseny.kapoulkine@gmail.com
Browse files

tests: Added BadaSDK to tests, changed report coloring to mark cells that...

tests: Added BadaSDK to tests, changed report coloring to mark cells that compiled successfully but skipped execution

git-svn-id: http://pugixml.googlecode.com/svn/trunk@841 99668b35-9821-0410-8761-19e4c4f06640
parent f817d5bc
No related branches found
No related tags found
No related merge requests found
...@@ -673,7 +673,8 @@ else ...@@ -673,7 +673,8 @@ else
exit "Unknown toolset $(toolset)!" ; exit "Unknown toolset $(toolset)!" ;
} }
COVSUCCESS = "echo $" "(COVPREFIX) success" ; RUNRESULT = "success" ;
COVSUCCESS = "echo $" "(COVPREFIX) $" "(RUNRESULT)" ;
if ( $(toolset:I=^mingw) || $(toolset:I=^gcc) ) if ( $(toolset:I=^mingw) || $(toolset:I=^gcc) )
{ {
...@@ -718,6 +719,8 @@ else ...@@ -718,6 +719,8 @@ else
{ {
if ( $(toolset:I=(^xbox360|^ps3|wince|^bada$)) ) if ( $(toolset:I=(^xbox360|^ps3|wince|^bada$)) )
{ {
RUNRESULT = "skiprun" ;
actions RunAction actions RunAction
{ {
} }
......
...@@ -34,7 +34,7 @@ sub getcpucount ...@@ -34,7 +34,7 @@ sub getcpucount
undef; 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); $fast = scalar grep(/^fast$/, @ARGV);
@toolsets = map { /^fast$/ ? () : ($_) } @ARGV; @toolsets = map { /^fast$/ ? () : ($_) } @ARGV;
...@@ -101,12 +101,13 @@ foreach $toolset (@toolsets) ...@@ -101,12 +101,13 @@ foreach $toolset (@toolsets)
while (<PIPE>) while (<PIPE>)
{ {
# ... autotest release [wchar] success # ... autotest release [wchar] success
if (/^\.\.\. autotest (\S+) \[(.*?)\] success/) if (/^\.\.\. autotest (\S+) \[(.*?)\] (success|skiprun)/)
{ {
my $configuration = $1; my $configuration = $1;
my $defineset = ($2 eq $stddefine) ? '' : $2; 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 # ... autotest release [wchar] gcov
elsif (/^\.\.\. autotest (\S+) \[(.*?)\] gcov/) elsif (/^\.\.\. autotest (\S+) \[(.*?)\] gcov/)
......
...@@ -34,6 +34,8 @@ sub prettytoolset ...@@ -34,6 +34,8 @@ sub prettytoolset
return "Sony PlayStation3 GCC" if ($toolset =~ /^ps3_gcc/); return "Sony PlayStation3 GCC" if ($toolset =~ /^ps3_gcc/);
return "Sony PlayStation3 SNC" if ($toolset =~ /^ps3_snc/); return "Sony PlayStation3 SNC" if ($toolset =~ /^ps3_snc/);
return "BadaSDK (GCC)" if ($toolset =~ /^bada$/);
$toolset; $toolset;
} }
...@@ -54,6 +56,8 @@ sub prettyplatform ...@@ -54,6 +56,8 @@ sub prettyplatform
return "x360" if ($toolset =~ /^xbox360/); return "x360" if ($toolset =~ /^xbox360/);
return "ps3" if ($toolset =~ /^ps3/); return "ps3" if ($toolset =~ /^ps3/);
return "arm" if ($toolset =~ /^bada/);
return "win64" if ($platform =~ /MSWin32-x64/); return "win64" if ($platform =~ /MSWin32-x64/);
return "win32" if ($platform =~ /MSWin32/); return "win32" if ($platform =~ /MSWin32/);
...@@ -93,11 +97,15 @@ while (<>) ...@@ -93,11 +97,15 @@ while (<>)
if ($info =~ /^prepare/) if ($info =~ /^prepare/)
{ {
$results{$fulltool}{$fullconf}{result} = 1; $results{$fulltool}{$fullconf}{result} = "";
} }
elsif ($info =~ /^success/) 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+)/) elsif ($info =~ /^coverage (\S+)/)
{ {
...@@ -178,7 +186,7 @@ foreach $tool (@toolsetarray) ...@@ -178,7 +186,7 @@ foreach $tool (@toolsetarray)
{ {
print "<td bgcolor='#cccccc'>&nbsp;</td>"; print "<td bgcolor='#cccccc'>&nbsp;</td>";
} }
elsif ($$info{result} == 0) elsif ($$info{result} eq "success")
{ {
my $coverage = $$info{coverage}; my $coverage = $$info{coverage};
...@@ -191,6 +199,10 @@ foreach $tool (@toolsetarray) ...@@ -191,6 +199,10 @@ foreach $tool (@toolsetarray)
print "</td>"; print "</td>";
} }
elsif ($$info{result} eq "skiprun")
{
print "<td bgcolor='#ffff80' align='center'>pass</td>"
}
else else
{ {
print "<td bgcolor='#ff0000' align='center'>fail</td>" print "<td bgcolor='#ff0000' align='center'>fail</td>"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment