Commit 74839e86 authored by ulan@chromium.org's avatar ulan@chromium.org

Modifications to tests and test tools for Native Client V8.

BUG=2614

Review URL: https://chromiumcodereview.appspot.com/13638013
Patch from Brad Chen <bradchen@google.com>.

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@14178 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent e5b6a125
...@@ -90,3 +90,16 @@ test-platform-tls/FastTLS: SKIP ...@@ -90,3 +90,16 @@ test-platform-tls/FastTLS: SKIP
# This test times out. # This test times out.
test-threads/ThreadJoinSelf: SKIP test-threads/ThreadJoinSelf: SKIP
##############################################################################
[ $arch == nacl_ia32 || $arch == nacl_x64 ]
# These tests fail as there is no /tmp directory in Native Client.
test-log/LogAccessorCallbacks: SKIP
test-log/LogCallbacks: SKIP
test-log/ProfLazyMode: SKIP
# Native Client doesn't support sockets.
test-debug/DebuggerAgent: SKIP
test-debug/DebuggerAgentProtocolOverflowHeader: SKIP
test-sockets/Socket: SKIP
...@@ -57,6 +57,10 @@ class CcTestSuite(testsuite.TestSuite): ...@@ -57,6 +57,10 @@ class CcTestSuite(testsuite.TestSuite):
return [] return []
tests = [] tests = []
for test_desc in output.stdout.strip().split(): for test_desc in output.stdout.strip().split():
if test_desc.find('<') < 0:
# Native Client output can contain a few non-test arguments
# before the tests. Skip these.
continue
raw_test, dependency = test_desc.split('<') raw_test, dependency = test_desc.split('<')
if dependency != '': if dependency != '':
dependency = raw_test.split('/')[0] + '/' + dependency dependency = raw_test.split('/')[0] + '/' + dependency
......
...@@ -74,7 +74,13 @@ class MessageTestSuite(testsuite.TestSuite): ...@@ -74,7 +74,13 @@ class MessageTestSuite(testsuite.TestSuite):
"""Ignore empty lines, valgrind output and Android output.""" """Ignore empty lines, valgrind output and Android output."""
if not string: return True if not string: return True
return (string.startswith("==") or string.startswith("**") or return (string.startswith("==") or string.startswith("**") or
string.startswith("ANDROID")) string.startswith("ANDROID") or
# These five patterns appear in normal Native Client output.
string.startswith("DEBUG MODE ENABLED") or
string.startswith("tools/nacl-run.py") or
string.find("BYPASSING ALL ACL CHECKS") > 0 or
string.find("Native Client module will be loaded") > 0 or
string.find("NaClHostDescOpen:") > 0)
def IsFailureOutput(self, output, testpath): def IsFailureOutput(self, output, testpath):
expected_path = os.path.join(self.root, testpath + ".out") expected_path = os.path.join(self.root, testpath + ".out")
......
...@@ -202,3 +202,34 @@ debug-liveedit-stack-padding: SKIP ...@@ -202,3 +202,34 @@ debug-liveedit-stack-padding: SKIP
debug-liveedit-restart-frame: SKIP debug-liveedit-restart-frame: SKIP
debug-liveedit-double-call: SKIP debug-liveedit-double-call: SKIP
##############################################################################
# Native Client uses the ARM simulator so will behave similarly to arm
# on mjsunit tests.
# TODO(bradchen): enable more tests for NaCl V8 when it stops using
# the ARM simulator.
##############################################################################
[ $arch == nacl_ia32 || $arch == nacl_x64 ]
# There is no /tmp directory for NaCl runs
d8-os: SKIP
# Stack manipulations in LiveEdit is not implemented for this arch.
debug-liveedit-check-stack: SKIP
debug-liveedit-stack-padding: SKIP
debug-liveedit-restart-frame: SKIP
debug-liveedit-double-call: SKIP
# This test dumps core for arm.debug, so no reason to expect it to work
# for NaCl. The other three fuzz-natives tests seem to run fine.
# As noted above none of them are run in the arm.debug case.
fuzz-natives-part4: SKIP
# Requires bigger stack size in the Genesis and if stack size is increased,
# the test requires too much time to run. However, the problem test covers
# should be platform-independent.
regress/regress-1132: SKIP
# Poor performance for NaCl V8 causes an assertion failure for this test.
regress/regress-165637: SKIP
# Skip long running test that times out in debug mode and goes OOM on NaCl.
regress/regress-crbug-160010: SKIP
...@@ -68,12 +68,16 @@ SUPPORTED_ARCHS = ["android_arm", ...@@ -68,12 +68,16 @@ SUPPORTED_ARCHS = ["android_arm",
"arm", "arm",
"ia32", "ia32",
"mipsel", "mipsel",
"nacl_ia32",
"nacl_x64",
"x64"] "x64"]
# Double the timeout for these: # Double the timeout for these:
SLOW_ARCHS = ["android_arm", SLOW_ARCHS = ["android_arm",
"android_ia32", "android_ia32",
"arm", "arm",
"mipsel"] "mipsel",
"nacl_ia32",
"nacl_x64"]
def BuildOptions(): def BuildOptions():
......
...@@ -59,7 +59,7 @@ DEFS = {FAIL_OK: [FAIL, OKAY], ...@@ -59,7 +59,7 @@ DEFS = {FAIL_OK: [FAIL, OKAY],
# Support arches, modes to be written as keywords instead of strings. # Support arches, modes to be written as keywords instead of strings.
VARIABLES = {ALWAYS: True} VARIABLES = {ALWAYS: True}
for var in ["debug", "release", "android_arm", "android_ia32", "arm", "ia32", for var in ["debug", "release", "android_arm", "android_ia32", "arm", "ia32",
"mipsel", "x64"]: "mipsel", "x64", "nacl_ia32", "nacl_x64"]:
VARIABLES[var] = var VARIABLES[var] = var
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment