diff options
| author | ncbray@chromium.org <ncbray@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-11 02:27:08 +0000 |
|---|---|---|
| committer | ncbray@chromium.org <ncbray@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-11 02:27:08 +0000 |
| commit | 3ec729e5560164b9814a65234ee0b7ac7e2303bc (patch) | |
| tree | 4d0133abc7564cc493c7fdb99c1981fe95a37ad2 /ppapi/ppapi_nacl_test_common.gypi | |
| parent | 0f9969980cd06a0cc87ec30e00d17d6e331324ad (diff) | |
| download | chromium_src-3ec729e5560164b9814a65234ee0b7ac7e2303bc.zip chromium_src-3ec729e5560164b9814a65234ee0b7ac7e2303bc.tar.gz chromium_src-3ec729e5560164b9814a65234ee0b7ac7e2303bc.tar.bz2 | |
Port manifest query tests from nacl_integration to browser_tests.
fgets was refactored to read because fdopen was returning null in glibc.
These tests were disabled for glibc without explanation, so working around this
bug loses no coverage.
BUG=154400
Review URL: https://codereview.chromium.org/133033002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244313 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/ppapi_nacl_test_common.gypi')
| -rw-r--r-- | ppapi/ppapi_nacl_test_common.gypi | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/ppapi/ppapi_nacl_test_common.gypi b/ppapi/ppapi_nacl_test_common.gypi index 99599ef..34e61b37 100644 --- a/ppapi/ppapi_nacl_test_common.gypi +++ b/ppapi/ppapi_nacl_test_common.gypi @@ -90,6 +90,7 @@ '--strip-all', ], 'create_nmf': '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py', + 'create_nmf_args_portable%': [], }, 'target_conditions': [ ['generate_nmf==1 and build_newlib==1', { @@ -100,18 +101,22 @@ 'outputs': ['>(nmf_newlib)'], 'action': [ 'python', - '>@(_inputs)', + '>(create_nmf)', '--output=>(nmf_newlib)', + '>@(create_nmf_args_portable)', ], 'target_conditions': [ ['enable_x86_64==1', { 'inputs': ['>(out_newlib64)'], + 'action': ['>(out_newlib64)'], }], ['enable_x86_32==1', { 'inputs': ['>(out_newlib32)'], + 'action': ['>(out_newlib32)'], }], ['enable_arm==1', { 'inputs': ['>(out_newlib_arm)'], + 'action': ['>(out_newlib_arm)'], }], ], }, @@ -135,16 +140,18 @@ 'outputs': ['>(nmf_glibc)'], 'action': [ 'python', - '>@(_inputs)', + '>(create_nmf)', '--objdump=>(nacl_objdump)', '--output=>(nmf_glibc)', '--path-prefix=>(nexe_target)_libs', '--stage-dependencies=<(nacl_glibc_out_dir)', + '>@(create_nmf_args_portable)', ], 'target_conditions': [ ['enable_x86_64==1', { 'inputs': ['>(out_glibc64)'], 'action': [ + '>(out_glibc64)', '--library-path=>(libdir_glibc64)', '--library-path=>(tc_lib_dir_glibc64)', ], @@ -152,6 +159,7 @@ ['enable_x86_32==1', { 'inputs': ['>(out_glibc32)'], 'action': [ + '>(out_glibc32)', '--library-path=>(libdir_glibc32)', '--library-path=>(tc_lib_dir_glibc32)', ], @@ -171,8 +179,10 @@ 'outputs': ['>(nmf_pnacl_newlib)'], 'action': [ 'python', - '>@(_inputs)', + '>(create_nmf)', '--output=>(nmf_pnacl_newlib)', + '>(out_pnacl_newlib)', + '>@(create_nmf_args_portable)', ], }, ], |