OLD | NEW |
---|---|
1 # -*- python -*- | 1 # -*- python -*- |
2 # Copyright (c) 2011 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2011 The Native Client Authors. All rights reserved. |
3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
5 | 5 |
6 Import('env') | 6 Import('env') |
7 | 7 |
8 if 'TRUSTED_ENV' not in env: | 8 if 'TRUSTED_ENV' not in env: |
9 Return() | 9 Return() |
10 if env.Bit('nacl_static_link'): | 10 if env.Bit('nacl_static_link'): |
(...skipping 13 matching lines...) Expand all Loading... | |
24 'libimc_syscalls.so', | 24 'libimc_syscalls.so', |
25 'libgio.so', | 25 'libgio.so', |
26 'libnacl.so', | 26 'libnacl.so', |
27 ) | 27 ) |
28 file_mapping = [] | 28 file_mapping = [] |
29 for library_name in libraries: | 29 for library_name in libraries: |
30 file_mapping.append(('lib/%s' % library_name, | 30 file_mapping.append(('lib/%s' % library_name, |
31 env.File('${NACL_SDK_LIB}/' + library_name))) | 31 env.File('${NACL_SDK_LIB}/' + library_name))) |
32 | 32 |
33 | 33 |
34 test_prog_fname = 'ppapi_test_example_%s.nexe' % env.get('TARGET_FULLARCH') | 34 prog_suffix = env['PROGSUFFIX'] |
35 test_prog_fname = 'ppapi_test_example_%s%s' % (env.get('TARGET_FULLARCH'), | |
36 prog_suffix) | |
Nick Bray
2011/06/23 18:32:24
Why not interpolate prog_suffix like ${STAGING_DIR
pdox
2011/06/23 20:42:58
Done.
| |
35 test_prog = env.File('${STAGING_DIR}/' + test_prog_fname) | 37 test_prog = env.File('${STAGING_DIR}/' + test_prog_fname) |
36 file_mapping.append((test_prog_fname, test_prog)) | 38 file_mapping.append((test_prog_fname, test_prog)) |
37 | 39 |
38 | 40 |
39 node = env.PPAPIBrowserTester( | 41 node = env.PPAPIBrowserTester( |
40 'browser_dynamic_library_test.out', url='dynamic_library_test.html', | 42 'browser_dynamic_library_test.out', url='dynamic_library_test.html', |
41 files=[env.File('dynamic_library_test.html'), | 43 files=[env.File('dynamic_library_test.html'), |
42 env.File('dynamic_library_helper.js')], | 44 env.File('dynamic_library_helper.js')], |
43 map_files=file_mapping, | 45 map_files=file_mapping, |
44 # TODO(mseaborn): We will get some 404 errors because the "tls" | 46 # TODO(mseaborn): We will get some 404 errors because the "tls" |
45 # subdir is in nacl-glibc's search path (we should remove it) and | 47 # subdir is in nacl-glibc's search path (we should remove it) and |
46 # because we're not using an explicit mapping based on a manifest | 48 # because we're not using an explicit mapping based on a manifest |
47 # file yet. | 49 # file yet. |
48 args=['--allow_404', '--enable_experimental_js']) | 50 args=['--allow_404', '--enable_experimental_js']) |
49 | 51 |
50 env.AddNodeToTestSuite(node, ['dynamic_library_browser_tests'], | 52 env.AddNodeToTestSuite(node, ['dynamic_library_browser_tests'], |
51 'run_browser_dynamic_library_test', | 53 'run_browser_dynamic_library_test', |
52 is_broken=env.PPAPIBrowserTesterIsBroken()) | 54 is_broken=env.PPAPIBrowserTesterIsBroken()) |
OLD | NEW |