diff options
| author | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-30 17:55:22 +0000 |
|---|---|---|
| committer | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-30 17:55:22 +0000 |
| commit | e925d37075a601ebbad65857d1bdc1bab4c2c5aa (patch) | |
| tree | 92974e7a268fed25dbf7aee65b31004c21a3035d /o3d/tests/selenium/sample_list.txt | |
| parent | 8e2a8c24f3ce57222ca35ed128ab80563dbab7a0 (diff) | |
| download | chromium_src-e925d37075a601ebbad65857d1bdc1bab4c2c5aa.zip chromium_src-e925d37075a601ebbad65857d1bdc1bab4c2c5aa.tar.gz chromium_src-e925d37075a601ebbad65857d1bdc1bab4c2c5aa.tar.bz2 | |
Fix except clauses with multiple browser names. The scripts parse the list on spaces, so delete the extra whitespace. Also, special case Chrome for one v8 test, in which Chrome expects no parenthesis around the exception.
Review URL: http://codereview.chromium.org/1566005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43104 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/tests/selenium/sample_list.txt')
| -rw-r--r-- | o3d/tests/selenium/sample_list.txt | 9 |
1 files changed, 5 insertions, 4 deletions
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) |