diff options
| author | hidehiko@chromium.org <hidehiko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-22 20:08:41 +0000 |
|---|---|---|
| committer | hidehiko@chromium.org <hidehiko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-22 20:08:41 +0000 |
| commit | 8adce546f4df324795b5bb98c60f4f6bce0e96d0 (patch) | |
| tree | 08fe6ca1da5cef30e1796f234ad1534e5890f73d /ppapi/ppapi_nacl_test_common.gypi | |
| parent | 33270c734fac44abdd7160c6ee1f955d43541adf (diff) | |
| download | chromium_src-8adce546f4df324795b5bb98c60f4f6bce0e96d0.zip chromium_src-8adce546f4df324795b5bb98c60f4f6bce0e96d0.tar.gz chromium_src-8adce546f4df324795b5bb98c60f4f6bce0e96d0.tar.bz2 | |
Introduce create_nonsfi_test_nmf.py to simplify nacl_test_data.gyp
This CL is clean up of nacl_test_data.gyp file by supporting
nonsfi testing in ppapi_nacl_test_common.gypi.
For that purpose, this CL introduces a simple script
create_nonsfi_test_nmf.py, to generate .nmf files based on
gyp configurations.
TEST=Ran browser_tests --gtest_filter=NaClBrowserTest* locally, and ran trybots with --clobber.
BUG=368949
Review URL: https://codereview.chromium.org/294593005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272295 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/ppapi_nacl_test_common.gypi')
| -rw-r--r-- | ppapi/ppapi_nacl_test_common.gypi | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/ppapi/ppapi_nacl_test_common.gypi b/ppapi/ppapi_nacl_test_common.gypi index 0d9b676..5a42ae60 100644 --- a/ppapi/ppapi_nacl_test_common.gypi +++ b/ppapi/ppapi_nacl_test_common.gypi @@ -35,6 +35,7 @@ 'out_pnacl_newlib%': '>(nacl_pnacl_newlib_out_dir)/>(nexe_target)_newlib_pnacl.pexe', 'nmf_pnacl_newlib%': '>(nacl_pnacl_newlib_out_dir)/>(nexe_target).nmf', 'out_pnacl_newlib_x86_32_nonsfi_nexe': '>(nacl_pnacl_newlib_nonsfi_out_dir)/>(nexe_target)_pnacl_newlib_x32_nonsfi.nexe', + 'nmf_pnacl_newlib_nonsfi%': '>(nacl_pnacl_newlib_nonsfi_out_dir)/>(nexe_target).nmf', }], ], }, @@ -64,8 +65,8 @@ }, ], }], - # Nonsfi pnacl copy is covered below. Currently, these are exclusive. - ['test_files!=[] and build_pnacl_newlib==1 and disable_pnacl==0 and enable_x86_32_nonsfi==0', { + # Nonsfi pnacl copy is covered below. + ['test_files!=[] and build_pnacl_newlib==1 and disable_pnacl==0', { 'copies': [ { 'destination': '>(nacl_pnacl_newlib_out_dir)', @@ -106,6 +107,7 @@ ], 'create_nmf': '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py', 'create_nmf_args_portable%': [], + 'create_nonsfi_test_nmf': '<(DEPTH)/ppapi/tests/create_nonsfi_test_nmf.py', }, 'target_conditions': [ ['generate_nmf==1 and build_newlib==1', { @@ -206,6 +208,26 @@ }, ], }], + ['generate_nmf==1 and build_pnacl_newlib==1 and disable_pnacl==0 and enable_x86_32_nonsfi==1', { + 'actions': [ + { + 'action_name': 'Generate PNACL NEWLIB nonsfi NMF', + # If we add support for ARM, we should split the dependency on + # out_pnacl_newlib_x86_32_nonsfi_nexe to 'target_conditions', + # similar to build_newlib=1 config declared above. + 'inputs': ['>(create_nonsfi_test_nmf)', + '>(out_pnacl_newlib_x86_32_nonsfi_nexe)'], + 'outputs': ['>(nmf_pnacl_newlib_nonsfi)'], + 'action': [ + 'python', + '>(create_nonsfi_test_nmf)', + '--output=>(nmf_pnacl_newlib_nonsfi)', + '--program=>(out_pnacl_newlib_x86_32_nonsfi_nexe)', + '>@(create_nmf_args_portable)' + ], + }, + ], + }], ], }], ], |