Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11045)

Unified Diff: chrome/test/data/nacl/nacl_test_data.gyp

Issue 786273008: Non-SFI mode: Enable PnaclTransitional Non-SFI browser tests on x86-64 bots. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser_tests.isolate ('k') | chrome/test/nacl/nacl_browsertest_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/data/nacl/nacl_test_data.gyp
diff --git a/chrome/test/data/nacl/nacl_test_data.gyp b/chrome/test/data/nacl/nacl_test_data.gyp
index 63c8545de85d591e89473c17753402442efe240d..06bb7310306754564c6efea0869a97aa0a03bb63 100644
--- a/chrome/test/data/nacl/nacl_test_data.gyp
+++ b/chrome/test/data/nacl/nacl_test_data.gyp
@@ -41,7 +41,7 @@
],
},
'conditions': [
- ['target_arch=="ia32" and OS=="linux"', {
+ ['(target_arch=="ia32" or target_arch=="x64") and OS=="linux"', {
# Enable nonsfi testing on ia32-linux environment.
# This flag causes test_files to be copied into nonsfi directory,
# too.
@@ -540,7 +540,7 @@
# disabled, but building the binary should work.
# We cannot disable building, as enable_XXX variables are also used
# to build newlib linked nexes.
- ['target_arch=="ia32" and OS=="linux"', {
+ ['(target_arch=="ia32" or target_arch=="x64") and OS=="linux"', {
# Enable nonsfi testing on ia32-linux environment.
'variables': {
'build_pnacl_newlib': 1,
@@ -594,7 +594,7 @@
'ppapi_test_lib',
],
'conditions': [
- ['target_arch=="ia32" and OS=="linux"', {
+ ['(target_arch=="ia32" or target_arch=="x64") and OS=="linux"', {
# Enable nonsfi testing on ia32-linux environment.
'variables': {
'enable_x86_32_nonsfi': 1,
« no previous file with comments | « chrome/browser_tests.isolate ('k') | chrome/test/nacl/nacl_browsertest_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698