Commit 30cca74b authored by mseaborn@chromium.org's avatar mseaborn@chromium.org

NaCl: Update revision in DEPS, r6303 -> r6322

This pulls in the following Native Client changes:

r6304: (mcgrathr) Remove magic to get IRT-compatible linking layout for browser-targetted nexes
r6305: (ncbray) Add a hard timeout for the browser tester to stop runaway tests.
r6306: (mcgrathr) Define private __aeabi_read_tp for IRT
r6307: (mcgrathr) Load IRT for spec2k runs
r6308: (jvoung) Bump toolchain deps. Pull in pdox's windows changes:
r6309: (mcgrathr) Remove -lppapi hack for nacl_irt_test
r6310: (sehr) Make __launchExecutableFromFd take a continuation rather than returning success
r6311: (sehr) Remove possible use-after-free attack from console logging.
r6312: (mseaborn) Cleanup: Remove obsolete reference to SDL from comment in sel_main.c
r6313: (bradnelson) Allow branch to get either native_client (as on the buildbots)
r6314: (jvoung) Fix pnacl glibc builder -- no more platform libs in sdk() after removal of link_segment_gap.o:
r6315: (mseaborn) Cleanup: Fix typo in comment
r6316: (mseaborn) Cleanup: Fix spelling: "seperate" -> "separate"
r6318: (mcgrathr) Clean up buildbot context tests, get browser tests re-enabled on trybots
r6319: (ncbray) Fixed how NaCl's build system used asserts.
r6320: (ncbray) Added a stress test for determining now many nexes can be loaded simultaneously.
r6321: (ncbray) Fixed breakage introduced in r6320.
r6322: (mseaborn) Only set SDKROOT for standalone builds - redo r4926.

Also, disable a thread safety stress test that is known to be flaky on
Windows (run_ppapi_ppb_var_browser_test).

BUG=none
TEST=trybots


Review URL: http://codereview.chromium.org/7566045

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95562 0039d316-1c4b-4281-b951-d872f2087c98
parent ae8ada21
...@@ -9,9 +9,9 @@ vars = { ...@@ -9,9 +9,9 @@ vars = {
"swig_revision": "69281", "swig_revision": "69281",
# These hashes need to be updated when nacl_revision is changed. # These hashes need to be updated when nacl_revision is changed.
# After changing nacl_revision, run 'gclient runhooks' to get the new values. # After changing nacl_revision, run 'gclient runhooks' to get the new values.
"nacl_irt_hash_x86_32": "10df0b6f680232576432cadbec94a4af632cf948", "nacl_irt_hash_x86_32": "4bb285d7560668a72dec1d42e44d6a2bf744170b",
"nacl_irt_hash_x86_64": "a54389c2917fabe257358ace75d0b7d8cd4611ea", "nacl_irt_hash_x86_64": "e317b15c9c4527fd91cdb236d5f181552404e479",
"nacl_revision": "6303", "nacl_revision": "6322",
# After changing nacl_revision, run 'glient sync' and check native_client/DEPS # After changing nacl_revision, run 'glient sync' and check native_client/DEPS
# to update other nacl_*_revision's. # to update other nacl_*_revision's.
# TODO(brettw) We should use the "From" syntax to avoid hardcoding the # TODO(brettw) We should use the "From" syntax to avoid hardcoding the
......
...@@ -31,6 +31,10 @@ def Main(args): ...@@ -31,6 +31,10 @@ def Main(args):
# TODO(ncbray): Reenable when this issue is resolved. # TODO(ncbray): Reenable when this issue is resolved.
# http://code.google.com/p/nativeclient/issues/detail?id=2091 # http://code.google.com/p/nativeclient/issues/detail?id=2091
tests_to_disable.append('run_ppapi_bad_browser_test') tests_to_disable.append('run_ppapi_bad_browser_test')
# This thread safety stress test is flaky on at least Windows.
# See http://code.google.com/p/nativeclient/issues/detail?id=2124
# TODO(mseaborn): Reenable when this issue is resolved.
tests_to_disable.append('run_ppapi_ppb_var_browser_test')
if sys.platform == 'darwin': if sys.platform == 'darwin':
# The following test is failing on Mac OS X 10.5. This may be # The following test is failing on Mac OS X 10.5. This may be
......
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