Index: ppapi/tests/extensions/extensions.gyp |
diff --git a/ppapi/tests/extensions/extensions.gyp b/ppapi/tests/extensions/extensions.gyp |
index 163b8ef3ce66b27e06bc6997863a077adf66b643..82d85592ca98f605d51aab64f46bbad689f117f0 100644 |
--- a/ppapi/tests/extensions/extensions.gyp |
+++ b/ppapi/tests/extensions/extensions.gyp |
@@ -54,10 +54,8 @@ |
'type': 'none', |
'variables': { |
'nexe_target': 'ppapi_tests_extensions_packaged_app', |
- # TODO(teravest): Add testing for glibc, pnacl, and nonsfi modes. |
'build_newlib': 1, |
'build_glibc': 0, |
- 'build_pnacl_newlib': 0, |
'nexe_destination_dir': 'test_data/ppapi/tests/extensions/packaged_app', |
'sources': [ |
'packaged_app/test_packaged_app.cc' |
@@ -69,6 +67,21 @@ |
'packaged_app/manifest.json', |
], |
}, |
+ 'conditions': [ |
+ ['target_arch=="ia32" and OS=="linux"', { |
+ # Enable nonsfi testing only on ia32-linux environment. |
+ # See chrome/test/data/nacl/nacl_test_data.gyp for more info. |
+ 'variables': { |
+ 'build_pnacl_newlib': 1, |
+ 'translate_pexe_with_build': 1, |
+ 'enable_x86_32_nonsfi': 1, |
+ }, |
+ }], |
+ ], |
+ # Shim is a dependency for the nexe because we pre-translate. |
+ 'dependencies': [ |
+ '<(DEPTH)/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_irt_shim.gyp:aot', |
+ ], |
}, |
], |
} |