summaryrefslogtreecommitdiffstats
path: root/o3d
diff options
context:
space:
mode:
authorvangelis@google.com <vangelis@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-21 02:11:50 +0000
committervangelis@google.com <vangelis@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-21 02:11:50 +0000
commitd083ddaf522be8dd710c9820c03aecb314f108a2 (patch)
tree600952442e2affb0f5feef86050e04cc37eb15bb /o3d
parent909c61fdb59c5d9d890140d0ddf64436da378ad3 (diff)
downloadchromium_src-d083ddaf522be8dd710c9820c03aecb314f108a2.zip
chromium_src-d083ddaf522be8dd710c9820c03aecb314f108a2.tar.gz
chromium_src-d083ddaf522be8dd710c9820c03aecb314f108a2.tar.bz2
Fixes for selenium test failures. Using the color factor to correct color differences in 2d sample.
Increasing the pixel diff threshold for texturesamplers and zsorting to its previous glory until we figure out what the proper values are. Bumping up DEPS for assets to pick up new reference image for zsorting sample. Review URL: http://codereview.chromium.org/159120 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21149 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
-rw-r--r--o3d/DEPS2
-rw-r--r--o3d/tests/selenium/sample_list.txt6
2 files changed, 4 insertions, 4 deletions
diff --git a/o3d/DEPS b/o3d/DEPS
index 966a8c8..947eec8 100644
--- a/o3d/DEPS
+++ b/o3d/DEPS
@@ -2,7 +2,7 @@ vars = {
"chromium_trunk":
"http://src.chromium.org/svn/trunk",
"nixysa_rev": "28",
- "o3d_code_rev": "97",
+ "o3d_code_rev": "98",
}
deps = {
diff --git a/o3d/tests/selenium/sample_list.txt b/o3d/tests/selenium/sample_list.txt
index d38cc11..5acb997 100644
--- a/o3d/tests/selenium/sample_list.txt
+++ b/o3d/tests/selenium/sample_list.txt
@@ -72,7 +72,7 @@
# http://wiki.corp.google.com/twiki/bin/view/Main/ClientThreeDSampleGuidelines
#
#
-medium 2d screenshot pdiff_threshold(200)
+medium 2d screenshot pdiff_threshold(200) colorfactor(0.8)
medium animation
large animated-scene screenshot timeout(45000) pdiff_threshold(200)
large beachdemo/beachdemo screenshot timeout(120000) pdiff_threshold(200) pdiff_threshold_mac(2100) downsample(1) except(*iexplore, *googlechrome)
@@ -108,11 +108,11 @@ medium skinning screenshot pdiff_threshold(200)
medium sobel screenshot pdiff_threshold(1400)
medium stencil_example screenshot(0) screenshot(100) screenshot(7777) pdiff_threshold(200) pdiff_threshold_win(200)
medium shadow-map screenshot pdiff_threshold(200)
-small texturesamplers screenshot pdiff_threshold(200) pdiff_threshold_win(200)
+small texturesamplers screenshot pdiff_threshold_win(1200) pdiff_threshold_mac(32200)
medium tutorial-primitive screenshot pdiff_threshold(200) pdiff_threshold_mac(10400)
large vertex-shader screenshot timeout(45000) pdiff_threshold(200) except(*iexplore)
medium vertex-shader-animation screenshot pdiff_threshold(200)
-medium zsorting screenshot pdiff_threshold(200)
+medium zsorting screenshot pdiff_threshold_win(200) pdiff_threshold_mac(39500)
# box2d-3d works in browsers but for some reason times out on some configs
#large box2d-3d/box2d-3d timeout(45000) except(*googlechrome)
large simpleviewer/simpleviewer screenshot pdiff_threshold(100)