summaryrefslogtreecommitdiffstats
path: root/o3d/tests
diff options
context:
space:
mode:
Diffstat (limited to 'o3d/tests')
-rw-r--r--o3d/tests/selenium/javascript_unit_test_list.txt2
-rw-r--r--o3d/tests/selenium/sample_list.txt2
-rw-r--r--o3d/tests/selenium/tests/v8-test.html2
3 files changed, 3 insertions, 3 deletions
diff --git a/o3d/tests/selenium/javascript_unit_test_list.txt b/o3d/tests/selenium/javascript_unit_test_list.txt
index 15a08235..7d49105 100644
--- a/o3d/tests/selenium/javascript_unit_test_list.txt
+++ b/o3d/tests/selenium/javascript_unit_test_list.txt
@@ -63,7 +63,7 @@ small math-test
small features-test except(*iexplore)
small quaternion-test
# TODO Temporarily removing until V8 bug is fixed
-#small v8-test
+small v8-test
small init-status-test
small quaternion-test
small base-test
diff --git a/o3d/tests/selenium/sample_list.txt b/o3d/tests/selenium/sample_list.txt
index 5759e8d..44bcfcd 100644
--- a/o3d/tests/selenium/sample_list.txt
+++ b/o3d/tests/selenium/sample_list.txt
@@ -69,7 +69,7 @@
medium 2d screenshot pdiff_threshold(41200)
medium animation
large animated-scene screenshot timeout(45000) pdiff_threshold(200)
-#large beachdemo/beachdemo screenshot timeout(120000) pdiff_threshold(1900) downsample(1) except(*iexplore)
+large beachdemo/beachdemo screenshot timeout(120000) pdiff_threshold(1900) downsample(1) except(*iexplore)
medium canvas screenshot pdiff_threshold(4700) pdiff_threshold_mac(14600)
medium canvas-fonts screenshot pdiff_threshold(1100) pdiff_threshold_mac(21900)
medium canvas-texturedraw
diff --git a/o3d/tests/selenium/tests/v8-test.html b/o3d/tests/selenium/tests/v8-test.html
index fa8173f..c331b52 100644
--- a/o3d/tests/selenium/tests/v8-test.html
+++ b/o3d/tests/selenium/tests/v8-test.html
@@ -319,7 +319,7 @@ g_suite.testV8CanInvokeBrowserConstructor = function() {
g_suite.testV8ReceivesExceptionOnInvokingUndefinedConstructor = function() {
var v8f = window.g_plugin.eval(
'function(f) { try { new f(); } catch(e) { return e; } }');
- g_test.assertEquals("TypeError: undefined is not a constructor",
+ g_test.assertEquals("TypeError: undefined is not a function",
v8f(undefined).toString());
};