From 3d3d1b6e409a109a3c00a24859d36e8105c8add0 Mon Sep 17 00:00:00 2001 From: "zea@chromium.org" Date: Thu, 28 Apr 2011 23:57:15 +0000 Subject: 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 --- chrome/test/nacl_test_injection/buildbot_nacl_integration.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'chrome') 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) -- cgit v1.1