diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-28 23:57:15 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-28 23:57:15 +0000 |
| commit | 3d3d1b6e409a109a3c00a24859d36e8105c8add0 (patch) | |
| tree | 5df032666f79f212250e27776c4435373deaf023 /chrome | |
| parent | 8d89273652a9952361b58fa5f77efd59a5a939e9 (diff) | |
| download | chromium_src-3d3d1b6e409a109a3c00a24859d36e8105c8add0.zip chromium_src-3d3d1b6e409a109a3c00a24859d36e8105c8add0.tar.gz chromium_src-3d3d1b6e409a109a3c00a24859d36e8105c8add0.tar.bz2 | |
Revert 83430 - NaCl: Re-enable tests, since they pass on the trybotsBUG=noneTEST=nacl_integrationReview URL: http://codereview.chromium.org/6904067
TBR=mseaborn@chromium.org
Review URL: http://codereview.chromium.org/6902132
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83450 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rwxr-xr-x | chrome/test/nacl_test_injection/buildbot_nacl_integration.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/chrome/test/nacl_test_injection/buildbot_nacl_integration.py b/chrome/test/nacl_test_injection/buildbot_nacl_integration.py index 953f4bd..93aac77 100755 --- a/chrome/test/nacl_test_injection/buildbot_nacl_integration.py +++ b/chrome/test/nacl_test_injection/buildbot_nacl_integration.py @@ -9,6 +9,16 @@ import sys def Main(): + # TODO(ncbray): figure out why this is failing on windows and enable. + if (sys.platform in ['win32', 'cygwin'] and + 'xp-nacl-chrome' not in os.environ.get('PWD', '')): return + # TODO(ncbray): figure out why this is failing on mac and re-enable. + if (sys.platform == 'darwin' and + 'mac-nacl-chrome' not in os.environ.get('PWD', '')): return + # TODO(ncbray): figure out why this is failing on some linux trybots. + if (sys.platform in ['linux', 'linux2'] and + 'hardy64-nacl-chrome' not in os.environ.get('PWD', '')): return + script_dir = os.path.dirname(os.path.abspath(__file__)) test_dir = os.path.dirname(script_dir) chrome_dir = os.path.dirname(test_dir) |