Chromium Code Reviews Chromium Code Reviews
Issue 10837207:
Add NaCl smoke test to browser_tests. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src| OLD | NEW |
|---|---|
| (Empty) | |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | |
| 2 # Use of this source code is governed by a BSD-style license that can be | |
| 3 # found in the LICENSE file. | |
| 4 | |
| 5 { | |
| 6 'includes': [ | |
| 7 '../../../../native_client/build/untrusted.gypi', | |
| 8 ], | |
| 9 'targets': [ | |
|
bradn
2012/08/13 21:10:59
This is pretty much what I recalled.
A comment to
Nick Bray (chromium)
2012/08/13 23:16:26
Done.
| |
| 10 { | |
| 11 'target_name': 'nacl_tests', | |
| 12 'type': 'none', | |
| 13 'dependencies': [ | |
| 14 '../../../../ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib', | |
| 15 '../../../../ppapi/native_client/native_client.gyp:ppapi_lib', | |
| 16 '../../../../ppapi/native_client/native_client.gyp:nacl_irt', | |
| 17 ], | |
| 18 'copies': [ | |
| 19 { | |
| 20 'destination': '<(PRODUCT_DIR)/nacl_test_data/newlib', | |
| 21 'files': [ | |
| 22 'nacl_load_test.html', | |
| 23 'simple.nmf' | |
| 24 ], | |
| 25 }, | |
| 26 { | |
| 27 'destination': '<(PRODUCT_DIR)/nacl_test_data/glibc', | |
| 28 'files': [ | |
| 29 'nacl_load_test.html', | |
| 30 ], | |
| 31 }, | |
| 32 ], | |
| 33 'variables': { | |
| 34 'nexe_target': 'simple', | |
| 35 'build_newlib': 1, | |
| 36 'out_newlib32': '<(PRODUCT_DIR)/nacl_test_data/newlib/>(nexe_target)_new lib_x32.nexe', | |
|
Mark Seaborn
2012/08/13 22:16:59
Stupid question: is it really necessary to list al
Nick Bray (chromium)
2012/08/13 23:16:26
Long term, no. Short term, yes. This is how we c
| |
| 37 'out_newlib64': '<(PRODUCT_DIR)/nacl_test_data/newlib/>(nexe_target)_new lib_x64.nexe', | |
| 38 'out_newlib_arm': '<(PRODUCT_DIR)/nacl_test_data/newlib/>(nexe_target)_n ewlib_arm.nexe', | |
| 39 'out_glibc32': '<(PRODUCT_DIR)/nacl_test_data/glibc/>(nexe_target)_glibc _x32.nexe', | |
| 40 'out_glibc64': '<(PRODUCT_DIR)/nacl_test_data/glibc/>(nexe_target)_glibc _x64.nexe', | |
| 41 'out_glibc_arm': '<(PRODUCT_DIR)/nacl_test_data/glibc/>(nexe_target)_gli bc_arm.nexe', | |
| 42 'include_dirs': [ | |
| 43 '../../../..', | |
| 44 ], | |
| 45 'link_flags': [ | |
| 46 '-lppapi_cpp', | |
| 47 '-lppapi', | |
| 48 '-lplatform', | |
|
Mark Seaborn
2012/08/13 22:16:59
AFAICT, you don't use libplatform or libgio in the
Nick Bray (chromium)
2012/08/13 23:16:26
Done.
| |
| 49 '-lpthread', | |
| 50 '-lgio', | |
| 51 ], | |
| 52 'sources': [ | |
| 53 'simple.cc', | |
| 54 ], | |
| 55 }, | |
| 56 'conditions': [ | |
| 57 ['target_arch!="arm"', { | |
| 58 'variables': { | |
| 59 'compile_flags': [ | |
| 60 '-mno-tls-use-call', | |
|
Mark Seaborn
2012/08/13 22:16:59
Why is this here? It looks like it has been cargo
Nick Bray (chromium)
2012/08/13 23:16:26
Done.
| |
| 61 ], | |
| 62 }, | |
| 63 }], | |
| 64 ['target_arch!="arm" and disable_glibc==0', { | |
| 65 'variables': { | |
| 66 'build_glibc': 1, | |
| 67 # NOTE: Use /lib, not /lib64 here; it is a symbolic link which | |
| 68 # doesn't work on Windows. | |
| 69 'libdir_glibc64': '>(nacl_glibc_tc_root)/x86_64-nacl/lib', | |
| 70 'libdir_glibc32': '>(nacl_glibc_tc_root)/x86_64-nacl/lib32', | |
| 71 'nacl_objdump': '>(nacl_glibc_tc_root)/bin/x86_64-nacl-objdump', | |
| 72 'nmf_glibc%': '<(PRODUCT_DIR)/nacl_test_data/glibc/>(nexe_target).nm f', | |
| 73 }, | |
| 74 'actions': [ | |
| 75 { | |
| 76 'action_name': 'Generate GLIBC NMF and copy libs', | |
| 77 'inputs': ['>(out_glibc64)', '>(out_glibc32)'], | |
| 78 # NOTE: There is no explicit dependency for the lib32 | |
| 79 # and lib64 directories created in the PRODUCT_DIR. | |
| 80 # They are created as a side-effect of NMF creation. | |
| 81 'outputs': ['>(nmf_glibc)'], | |
| 82 'action': [ | |
| 83 'python', | |
| 84 '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py', | |
| 85 '>@(_inputs)', | |
| 86 '--objdump=>(nacl_objdump)', | |
| 87 '--library-path=>(libdir_glibc64)', | |
| 88 '--library-path=>(libdir_glibc32)', | |
| 89 '--output=>(nmf_glibc)', | |
| 90 '--stage-dependencies=<(PRODUCT_DIR)/nacl_test_data/glibc', | |
| 91 '--toolchain=glibc', | |
| 92 ], | |
| 93 }, | |
| 94 ], | |
| 95 }], | |
| 96 ], | |
| 97 }, | |
| 98 ], | |
| 99 | |
| 100 } | |
| 101 | |
| OLD | NEW |
