diff options
| author | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-19 03:49:17 +0000 |
|---|---|---|
| committer | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-19 03:49:17 +0000 |
| commit | 710e195f018faf4e1ac15148bf93df6071b5646c (patch) | |
| tree | 7a2b6249d9e45f90411ee672c29be70d1157ea3d /chrome/test/nacl_test_injection | |
| parent | f69877fc16aa53537815f505d475bada281db5e1 (diff) | |
| download | chromium_src-710e195f018faf4e1ac15148bf93df6071b5646c.zip chromium_src-710e195f018faf4e1ac15148bf93df6071b5646c.tar.gz chromium_src-710e195f018faf4e1ac15148bf93df6071b5646c.tar.bz2 | |
NaCl: Enable tests on Windows
These tests have been working on the Windows NaCl/Chromium integration
bot for a while.
Set "--disable-tests" to disable a single test which currently fails in
the debug build.
Update DEPS to pull in the version of NaCl where the "--disable-tests"
option was added.
BUG=http://code.google.com/p/nativeclient/issues/detail?id=2039
TEST=nacl_integration step on the trybots
Review URL: http://codereview.chromium.org/7282035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92960 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/nacl_test_injection')
| -rwxr-xr-x | chrome/test/nacl_test_injection/buildbot_nacl_integration.py | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/chrome/test/nacl_test_injection/buildbot_nacl_integration.py b/chrome/test/nacl_test_injection/buildbot_nacl_integration.py index 5f0f2a9..fad00c9 100755 --- a/chrome/test/nacl_test_injection/buildbot_nacl_integration.py +++ b/chrome/test/nacl_test_injection/buildbot_nacl_integration.py @@ -16,10 +16,12 @@ def Main(): # On the main Chrome waterfall, we may need to control where the tests are # run. - # TODO(ncbray): enable on all platforms. - if sys.platform in ['win32', 'cygwin']: return + # TODO(mseaborn): Enable these tests on Mac OS X. We believe that + # NaCl's startup within Chromium may be flaky on Mac and + # occasionally fail due to a kernel bug that we need to work + # around. + # See http://code.google.com/p/nativeclient/issues/detail?id=1835 if sys.platform == 'darwin': return - # if sys.platform in ['linux', 'linux2']: return # Uncomment the following line if there is skew in the PPAPI interface # and the tests are failing. Comment out once the issues are resolved. @@ -32,6 +34,14 @@ def Main(): nacl_integration_script = os.path.join( src_dir, 'native_client/build/buildbot_chrome_nacl_stage.py') cmd = [sys.executable, nacl_integration_script] + sys.argv[1:] + + if sys.platform in ('win32', 'cygwin'): + # TODO(mseaborn): Re-enable this test when it passes. + # See http://code.google.com/p/nativeclient/issues/detail?id=2038 + # It is disabled here because it fails in the debug build of Chromium + # but not in the release build that the NaCl buildbots test against. + cmd.append('--disable_tests=ppapi_ppb_scrollbar_browser_test') + print cmd subprocess.check_call(cmd) |