Index: chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py |
diff --git a/chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py b/chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py |
index 29ef88a0f68754fa7e9bd515fdf1334f1ff620c4..be3d505cef5e49fdb6e9fd2c86e4da5d27cc6ef8 100755 |
--- a/chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py |
+++ b/chrome/test/nacl_test_injection/buildbot_chrome_nacl_stage.py |
@@ -324,11 +324,11 @@ def Main(): |
options.enable_glibc = 0 |
# Set defaults for enabling pnacl. |
+ # This is disabled since we are moving to gyp tests. They were also |
+ # broken by NaCl r11090, and fixing that requires adding more |
+ # cross-repo naming conventions. |
if options.enable_pnacl == -1: |
- if options.integration_bot or options.morenacl_bot: |
- options.enable_pnacl = 1 |
- else: |
- options.enable_pnacl = 0 |
+ options.enable_pnacl = 0 |
if args: |
parser.error('ERROR: invalid argument') |