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

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

Issue 10834447: Scons: Drop the uses_ppapi argument from CommandSelLdrTestNacl() (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: add nonirt_libs Created 8 years, 4 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
« no previous file with comments | « SConstruct ('k') | tests/nameservice/nacl.scons » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # -*- python -*- 1 # -*- python -*-
2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. 2 # Copyright (c) 2012 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 srpc_mf_obj = env.ComponentObject('srpc_manifest_file_test.o', 8 srpc_mf_obj = env.ComponentObject('srpc_manifest_file_test.o',
9 'srpc_manifest_file_test.c') 9 'srpc_manifest_file_test.c')
10 srpc_mf_nexe_name = env.ProgramNameForNmf('srpc_manifest_file_test') 10 srpc_mf_nexe_name = env.ProgramNameForNmf('srpc_manifest_file_test')
11 srpc_mf_nexe = env.ComponentProgram(srpc_mf_nexe_name, 11 srpc_mf_nexe = env.ComponentProgram(srpc_mf_nexe_name,
12 srpc_mf_obj, 12 srpc_mf_obj,
13 EXTRA_LIBS=[ 13 EXTRA_LIBS=[
14 'srpc', 14 'srpc',
15 'platform', 15 'platform',
16 'gio', 16 'gio',
17 'imc', 17 'imc',
18 'imc_syscalls', 18 'imc_syscalls',
19 '${NONIRT_LIBS}',
19 '${PTHREAD_LIBS}']) 20 '${PTHREAD_LIBS}'])
20 env.Publish(srpc_mf_nexe_name, 'run', 21 env.Publish(srpc_mf_nexe_name, 'run',
21 ['srpc_manifest_file_test.html', 'test_file.txt']) 22 ['srpc_manifest_file_test.html', 'test_file.txt'])
22 23
23 # sel_universal test 24 # sel_universal test
24 25
25 node = env.SelUniversalTest( 26 node = env.SelUniversalTest(
26 'srpc_manifest_file_test.out', 27 'srpc_manifest_file_test.out',
27 srpc_mf_nexe, 28 srpc_mf_nexe,
28 sel_universal_flags=['--uses_reverse_service', 29 sel_universal_flags=['--uses_reverse_service',
29 '--var', 'obj_file', srpc_mf_obj, 30 '--var', 'obj_file', srpc_mf_obj,
30 '--var', 'nexe_file', srpc_mf_nexe, 31 '--var', 'nexe_file', srpc_mf_nexe,
31 '--command_file', 32 '--command_file',
32 env.File('srpc_manifest_file_test.stdin')], 33 env.File('srpc_manifest_file_test.stdin')],
33 stdout_golden=env.File('srpc_manifest_file_test.stdout'), 34 stdout_golden=env.File('srpc_manifest_file_test.stdout'),
34 # Slight misnomer: actually just enables the IRT.
35 uses_ppapi=True
36 ) 35 )
37 env.AddNodeToTestSuite(node, 36 env.AddNodeToTestSuite(node,
38 ['small_tests'], 37 ['small_tests'],
39 'run_srpc_manifest_file_test') 38 'run_srpc_manifest_file_test')
40 39
41 # post message version 40 # post message version
42 41
43 pm_mf_obj = env.ComponentObject('pm_manifest_file_test.o', 42 pm_mf_obj = env.ComponentObject('pm_manifest_file_test.o',
44 'pm_manifest_file_test.cc') 43 'pm_manifest_file_test.cc')
45 pm_mf_nexe_name = env.ProgramNameForNmf('pm_manifest_file_test') 44 pm_mf_nexe_name = env.ProgramNameForNmf('pm_manifest_file_test')
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 url='irt_manifest_file_test.html', 132 url='irt_manifest_file_test.html',
134 nmfs=['irt_manifest_file.nmf'], 133 nmfs=['irt_manifest_file.nmf'],
135 files=env.ExtractPublishedFiles(irt_mf_nexe_name), 134 files=env.ExtractPublishedFiles(irt_mf_nexe_name),
136 args=['--debug'], 135 args=['--debug'],
137 ) 136 )
138 env.AddNodeToTestSuite(node, 137 env.AddNodeToTestSuite(node,
139 ['chrome_browser_tests'], 138 ['chrome_browser_tests'],
140 'run_irt_manifest_file_chrome_browser_test', 139 'run_irt_manifest_file_chrome_browser_test',
141 is_broken=env.PPAPIBrowserTesterIsBroken() or 140 is_broken=env.PPAPIBrowserTesterIsBroken() or
142 env.Bit('nacl_glibc')) 141 env.Bit('nacl_glibc'))
OLDNEW
« no previous file with comments | « SConstruct ('k') | tests/nameservice/nacl.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698