diff options
| -rw-r--r-- | Jamrules.jam | 2 | ||||
| -rw-r--r-- | tests/autotest-local.pl | 5 | ||||
| -rw-r--r-- | tests/autotest-report.pl | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/Jamrules.jam b/Jamrules.jam index 96e6367..19075b9 100644 --- a/Jamrules.jam +++ b/Jamrules.jam @@ -81,7 +81,7 @@ if ( $(toolset:I=^mingw) || $(toolset:I=^gcc) || $(toolset:I=^bada) || $(toolset RESULT += -Wunused -Wstrict-aliasing=2 -Wundef -Wshadow -Wredundant-decls ; # gcc 4.0 has some warning regressions - if ( $(VERSION:X=4\.0) ) + if ( ! $(VERSION:I=4\.0) ) { RESULT += -Wold-style-cast ; # gives warnings for fpclassify() on gcc 4.0.1 RESULT += -Wswitch-default ; # gives false-positives for couple of switches on template argument on gcc 4.0.1 diff --git a/tests/autotest-local.pl b/tests/autotest-local.pl index cf1fd64..03ab955 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, bada, blackberry) : ($^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, blackberry, android, android_stlport) : ($^O =~ /solaris/) ? (suncc, suncc_x64) : &gcctoolset(); $fast = scalar grep(/^fast$/, @ARGV); @toolsets = map { /^fast$/ ? () : ($_) } @ARGV; @@ -81,6 +81,9 @@ foreach $toolset (@toolsets) foreach $defineset (@definesets) { + # STLport lacks bad_alloc on Android so skip configurations without PUGIXML_NO_EXCEPTIONS + next if ($toolset eq 'android_stlport' && $defineset !~ /PUGIXML_NO_EXCEPTIONS/); + $cmdline .= ":$defineset" if ($defineset ne ''); # any configuration with prepare but without result is treated as failed diff --git a/tests/autotest-report.pl b/tests/autotest-report.pl index 2b054ee..42f39b8 100644 --- a/tests/autotest-report.pl +++ b/tests/autotest-report.pl @@ -34,6 +34,7 @@ sub prettytoolset return "Sony PlayStation3 GCC" if ($toolset =~ /^ps3_gcc/); return "Sony PlayStation3 SNC" if ($toolset =~ /^ps3_snc/); + return "Android NDK (GCC)" . ($1 eq '_stlport' ? " STLport" : "") if ($toolset =~ /^android(.*)$/); return "bada SDK (GCC)" if ($toolset =~ /^bada$/); return "BlackBerry NDK (GCC)" if ($toolset =~ /^blackberry$/); @@ -57,6 +58,7 @@ sub prettyplatform return "x360" if ($toolset =~ /^xbox360/); return "ps3" if ($toolset =~ /^ps3/); + return "arm" if ($toolset =~ /^android/); return "arm" if ($toolset =~ /^bada/); return "arm" if ($toolset =~ /^blackberry/); |