diff options
| author | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 23:00:14 +0000 |
|---|---|---|
| committer | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-20 23:00:14 +0000 |
| commit | f96e3a052522bf18d6939d6cbf6cd90e0b182f22 (patch) | |
| tree | ecefe14b26acbce20a23eedd8b90c57218572386 /ppapi | |
| parent | 63271426bed4115c4af0aa37a15d4c081abe47a4 (diff) | |
| download | chromium_src-f96e3a052522bf18d6939d6cbf6cd90e0b182f22.zip chromium_src-f96e3a052522bf18d6939d6cbf6cd90e0b182f22.tar.gz chromium_src-f96e3a052522bf18d6939d6cbf6cd90e0b182f22.tar.bz2 | |
NaCl: Disable MIME type handler test in the standalone NaCl build
In the standalone NaCl build, this test runs with out-of-sync
service_runtime and IRT versions, which blocks a change to the IRT's
use of TLS that I'm trying to make
(http://codereview.chromium.org/10805032/).
BUG=http://code.google.com/p/chromium/issues/detail?id=138289
BUG=http://code.google.com/p/nativeclient/issues/detail?id=2881
TEST=nacl_integration
Review URL: https://chromiumcodereview.appspot.com/10808056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147733 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi')
| -rw-r--r-- | ppapi/native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/ppapi/native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons b/ppapi/native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons index 114f87a..cb80576 100644 --- a/ppapi/native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons +++ b/ppapi/native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons @@ -54,7 +54,19 @@ node = env.PPAPIBrowserTester('ppapi_extension_mime_handler.out', env.Depends(node, dest_copy) +# If this test is run in the standalone NaCl build, Chromium will use +# out-of-sync versions of service_runtime and the IRT. Chromium will +# use its (old) built-in versions of the trusted NaCl plugin and +# service_runtime, but these will use the locally-built (new) version +# of the IRT supplied via the NACL_IRT_LIBRARY environment variable. +# This version skew can cause the test to fail in some circumstances, +# so we disable this test in the standalone NaCl build, where running +# Chromium tests is deprecated anyway. For more info, see: +# http://code.google.com/p/chromium/issues/detail?id=138289 +is_broken = (env.PPAPIBrowserTesterIsBroken() or + not env.Bit('disable_dynamic_plugin_loading')) + env.AddNodeToTestSuite(node, ['chrome_browser_tests'], 'run_ppapi_extension_mime_handler_browser_test', - is_broken=env.PPAPIBrowserTesterIsBroken()) + is_broken=is_broken) |