Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(188)

Side by Side Diff: tests/browser_dynamic_library/nacl.scons

Issue 7242011: Get rid of assumptions about ".nexe" extension. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client/
Patch Set: '' Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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
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 test_prog_fname = 'ppapi_test_example_${TARGET_FULLARCH}${PROGSUFFIX}'
35 test_prog = env.File('${STAGING_DIR}/' + test_prog_fname) 35 test_prog = env.File('${STAGING_DIR}/' + test_prog_fname)
36 file_mapping.append((test_prog_fname, test_prog)) 36 file_mapping.append((test_prog_fname, test_prog))
37 37
38 38
39 node = env.PPAPIBrowserTester( 39 node = env.PPAPIBrowserTester(
40 'browser_dynamic_library_test.out', url='dynamic_library_test.html', 40 'browser_dynamic_library_test.out', url='dynamic_library_test.html',
41 files=[env.File('dynamic_library_test.html'), 41 files=[env.File('dynamic_library_test.html'),
42 env.File('dynamic_library_helper.js')], 42 env.File('dynamic_library_helper.js')],
43 map_files=file_mapping, 43 map_files=file_mapping,
44 # TODO(mseaborn): We will get some 404 errors because the "tls" 44 # 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 45 # 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 46 # because we're not using an explicit mapping based on a manifest
47 # file yet. 47 # file yet.
48 args=['--allow_404', '--enable_experimental_js']) 48 args=['--allow_404', '--enable_experimental_js'])
49 49
50 env.AddNodeToTestSuite(node, ['dynamic_library_browser_tests'], 50 env.AddNodeToTestSuite(node, ['dynamic_library_browser_tests'],
51 'run_browser_dynamic_library_test', 51 'run_browser_dynamic_library_test',
52 is_broken=env.PPAPIBrowserTesterIsBroken()) 52 is_broken=env.PPAPIBrowserTesterIsBroken())
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698