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

Side by Side Diff: tests/nameservice/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, 3 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 | « tests/manifest_file/nacl.scons ('k') | no next file » | 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 nameservice_test_nexe = env.ComponentProgram( 8 nameservice_test_nexe = env.ComponentProgram(
9 'nameservice_test', 9 'nameservice_test',
10 'nameservice_test.c', 10 'nameservice_test.c',
(...skipping 13 matching lines...) Expand all
24 'srpc_nameservice_test.c') 24 'srpc_nameservice_test.c')
25 srpc_ns_nexe_name = env.ProgramNameForNmf('srpc_nameservice_test') 25 srpc_ns_nexe_name = env.ProgramNameForNmf('srpc_nameservice_test')
26 srpc_ns_nexe = env.ComponentProgram(srpc_ns_nexe_name, 26 srpc_ns_nexe = env.ComponentProgram(srpc_ns_nexe_name,
27 srpc_ns_obj, 27 srpc_ns_obj,
28 EXTRA_LIBS=[ 28 EXTRA_LIBS=[
29 'srpc', 29 'srpc',
30 'platform', 30 'platform',
31 'gio', 31 'gio',
32 'imc', 32 'imc',
33 'imc_syscalls', 33 'imc_syscalls',
34 '${NONIRT_LIBS}',
34 '${PTHREAD_LIBS}']) 35 '${PTHREAD_LIBS}'])
35 env.Publish(srpc_ns_nexe_name, 'run', 36 env.Publish(srpc_ns_nexe_name, 'run',
36 ['srpc_nameservice_test.html']) 37 ['srpc_nameservice_test.html'])
37 38
38 # sel_universal test 39 # sel_universal test
39 40
40 node = env.SelUniversalTest( 41 node = env.SelUniversalTest(
41 'srpc_nameservice_test.out', 42 'srpc_nameservice_test.out',
42 srpc_ns_nexe, 43 srpc_ns_nexe,
43 sel_universal_flags=['--uses_reverse_service', 44 sel_universal_flags=['--uses_reverse_service',
44 '--command_file', 45 '--command_file',
45 env.File('srpc_nameservice_test.stdin')], 46 env.File('srpc_nameservice_test.stdin')],
46 stdout_golden=env.File('srpc_nameservice_test.stdout'), 47 stdout_golden=env.File('srpc_nameservice_test.stdout'),
47 # Slight misnomer: actually just enables the IRT.
48 uses_ppapi=True
49 ) 48 )
50 env.AddNodeToTestSuite(node, 49 env.AddNodeToTestSuite(node,
51 ['small_tests'], 50 ['small_tests'],
52 'run_srpc_nameservice_test') 51 'run_srpc_nameservice_test')
53 52
54 # postmessage version of srpc_nameservice_test 53 # postmessage version of srpc_nameservice_test
55 54
56 pm_ns_obj = env.ComponentObject('pm_nameservice_test.o', 55 pm_ns_obj = env.ComponentObject('pm_nameservice_test.o',
57 'pm_nameservice_test.cc') 56 'pm_nameservice_test.cc')
58 pm_ns_nexe_name = env.ProgramNameForNmf('pm_nameservice_test') 57 pm_ns_nexe_name = env.ProgramNameForNmf('pm_nameservice_test')
(...skipping 19 matching lines...) Expand all
78 nmf_names=['pm_nameservice_test'], 77 nmf_names=['pm_nameservice_test'],
79 files=env.ExtractPublishedFiles(pm_ns_nexe_name), 78 files=env.ExtractPublishedFiles(pm_ns_nexe_name),
80 args=['--debug'], 79 args=['--debug'],
81 osenv=['NACLVERBOSITY=0:pp_weak_ref=0:weak_ref=0'] 80 osenv=['NACLVERBOSITY=0:pp_weak_ref=0:weak_ref=0']
82 ) 81 )
83 82
84 env.AddNodeToTestSuite(node, 83 env.AddNodeToTestSuite(node,
85 ['chrome_browser_tests'], 84 ['chrome_browser_tests'],
86 'run_pm_nameservice_chrome_browser_test', 85 'run_pm_nameservice_chrome_browser_test',
87 is_broken=env.PPAPIBrowserTesterIsBroken()) 86 is_broken=env.PPAPIBrowserTesterIsBroken())
OLDNEW
« no previous file with comments | « tests/manifest_file/nacl.scons ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698