diff options
Diffstat (limited to 'o3d/tests')
| -rw-r--r-- | o3d/tests/selenium/javascript_unit_test_list.txt | 7 | ||||
| -rw-r--r-- | o3d/tests/selenium/sample_list.txt | 9 | ||||
| -rw-r--r-- | o3d/tests/selenium/tests/v8-test.html | 10 |
3 files changed, 17 insertions, 9 deletions
diff --git a/o3d/tests/selenium/javascript_unit_test_list.txt b/o3d/tests/selenium/javascript_unit_test_list.txt index 5679f3f..a142c02 100644 --- a/o3d/tests/selenium/javascript_unit_test_list.txt +++ b/o3d/tests/selenium/javascript_unit_test_list.txt @@ -45,8 +45,9 @@ # platforms. Platform specific versions override the # threshold for that platform. The default threshold is 10 pixels. # -# except(*firefox, *iexplore, *googlechrome) : Name of the browser -# environment(s) where the test should be skipped. +# except(*firefox,*iexplore,*googlechrome) : Name of the browser +# environment(s) where the test should be skipped. This list should +# not have spaces delimiting the browser names. # Default = "" # # pdiff_edge_ignore_off : Turn off edge detection function in pdiff. @@ -76,7 +77,7 @@ small util-test small pixel-perfection screenshot pdiff_threshold(200) pdiff_threshold_mac(3000) except(*iexplore) # Firefox opens an error dialog on this test stating that O3D failed to # start (issue #212). Chrome fails this test occasionally (issue #105). -medium offscreen-test except(*firefox, *googlechrome) +medium offscreen-test except(*firefox,*googlechrome) medium texture-set-test screenshot medium param-array-test screenshot small render-target-clear-test screenshot diff --git a/o3d/tests/selenium/sample_list.txt b/o3d/tests/selenium/sample_list.txt index 828ee6d..2fe3e67 100644 --- a/o3d/tests/selenium/sample_list.txt +++ b/o3d/tests/selenium/sample_list.txt @@ -49,8 +49,9 @@ # platforms. Platform specific versions override the # threshold for that platform. The default threshold is 10 pixels. # -# except(*firefox, *iexplore, *googlechrome) : Name of the browser -# environment(s) where the test should be skipped. +# except(*firefox,*iexplore,*googlechrome) : Name of the browser +# environment(s) where the test should be skipped. This list should +# not have spaces between the browser names. # Default = "" # # colorfactor(0 to 1) : Determines how important color is for comparison. A @@ -78,7 +79,7 @@ medium 2d screenshot timeout(30000) pdiff_threshold(200) pdiff_threshold_mac(41200) colorfactor(0.8) downsample(1) medium animation large animated-scene screenshot timeout(55000) pdiff_threshold(200) -large beachdemo/beachdemo screenshot timeout(120000) pdiff_threshold(200) pdiff_threshold_mac(2100) downsample(1) except(*iexplore, *googlechrome) +large beachdemo/beachdemo screenshot timeout(120000) pdiff_threshold(200) pdiff_threshold_mac(2100) downsample(1) except(*iexplore,*googlechrome) medium billboards screenshot pdiff_threshold(200) medium bitmap-draw-image screenshot pdiff_threshold(200) medium canvas screenshot pdiff_threshold(200) pdiff_threshold_mac(14600) @@ -130,7 +131,7 @@ large GoogleIO-2009/step14ex screenshot pdiff_threshold(200) timeou small TestSampleErrorTextureSmall pdiff_threshold(200) screenshots(5) small TestSampleHelloCube_TexturesSmall pdiff_threshold(450) screenshot # IE and chrome hang on this test. -small TestSampleRefreshPageLoad_Small except(*iexplore, *googlechrome) +small TestSampleRefreshPageLoad_Small except(*iexplore,*googlechrome) medium TestSampleCustomCamera pdiff_threshold(200) pdiff_threshold_win(200) screenshot run_time(180000) medium TestSamplePicking run_time(60000) medium TestSampleRenderMode run_time(60000) diff --git a/o3d/tests/selenium/tests/v8-test.html b/o3d/tests/selenium/tests/v8-test.html index 9d9a151..41a0ca2 100644 --- a/o3d/tests/selenium/tests/v8-test.html +++ b/o3d/tests/selenium/tests/v8-test.html @@ -556,8 +556,14 @@ g_suite.testV8ExceptionsInConstructorCallResultInErrorCallback = function() { if (!isChrome && !isSafari) { g_test.assertTrue(exceptionThrown); } - g_test.assertEquals( - 'Uncaught error in function() { throw "error"; }', error); + if (isChrome) { + // Chrome does not expect parenthesis around the error. + g_test.assertEquals( + 'Uncaught error in function() { throw "error"; }', error); + } else { + g_test.assertEquals( + 'Uncaught error in (function() { throw "error"; })', error); + } } }; |