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

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

Issue 7655003: Make chrome_browser_tests work with irt=0 again (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: Created 9 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
« SConstruct ('K') | « tests/srpc/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) 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 srpc_hw_libs = ['srpc', 'platform', 'gio', 'imc', 'imc_syscalls'] 8 srpc_hw_libs = ['srpc', 'platform', 'gio', 'imc', 'imc_syscalls']
9 9
10 srpc_hw_obj = env.ComponentObject('srpc_hw.o', 'srpc_hw.c') 10 srpc_hw_obj = env.ComponentObject('srpc_hw.o', 'srpc_hw.c')
11 srpc_hw_nexe_name = 'srpc_hw_%s' % env.get('TARGET_FULLARCH') 11 srpc_hw_nexe_name = 'srpc_hw_%s' % env.get('TARGET_FULLARCH')
12 srpc_hw_nexe = env.ComponentProgram(srpc_hw_nexe_name, 12 srpc_hw_nexe = env.ComponentProgram(srpc_hw_nexe_name,
13 srpc_hw_obj, 13 srpc_hw_obj,
14 EXTRA_LIBS=srpc_hw_libs + [ 14 EXTRA_LIBS=srpc_hw_libs + [
15 'pthread', 15 '${PTHREAD_LIBS}',
16 '${NON_PPAPI_BROWSER_LIBS}']) 16 '${NON_PPAPI_BROWSER_LIBS}'])
17 # srpc_hw_undecorated is necessary because srpc_hw_fd.html makes use of 17 # srpc_hw_undecorated is necessary because srpc_hw_fd.html makes use of
18 # __urlAsNaClDesc with a nexe name. 18 # __urlAsNaClDesc with a nexe name.
19 # TODO(sehr): We can get rid of this hack if we make that API take a manifest 19 # TODO(sehr): We can get rid of this hack if we make that API take a manifest
20 # file, but it is currently planned for obsoletion also. 20 # file, but it is currently planned for obsoletion also.
21 srpc_hw_undecorated = env.ComponentProgram('srpc_hw', 21 srpc_hw_undecorated = env.ComponentProgram('srpc_hw',
22 srpc_hw_obj, 22 srpc_hw_obj,
23 EXTRA_LIBS=srpc_hw_libs + [ 23 EXTRA_LIBS=srpc_hw_libs + [
24 'pthread', 24 '${PTHREAD_LIBS}',
25 '${NON_PPAPI_BROWSER_LIBS}']) 25 '${NON_PPAPI_BROWSER_LIBS}'])
26 26
27 env.Publish(srpc_hw_nexe_name, 'run', 27 env.Publish(srpc_hw_nexe_name, 'run',
28 ['srpc_hw.html', 28 ['srpc_hw.html',
29 'srpc_hw.nmf', 29 'srpc_hw.nmf',
30 'srpc_hw_data.html', 30 'srpc_hw_data.html',
31 'srpc_hw_fd.html', 31 'srpc_hw_fd.html',
32 srpc_hw_undecorated]) 32 srpc_hw_undecorated])
33 33
34 srpc_hw_nonbrowser = env.ComponentProgram('srpc_hw_nonbrowser', 34 srpc_hw_nonbrowser = env.ComponentProgram('srpc_hw_nonbrowser',
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 'srpc_hw_fd_browser_test.out', 77 'srpc_hw_fd_browser_test.out',
78 url='srpc_hw_fd.html', 78 url='srpc_hw_fd.html',
79 files=env.ExtractPublishedFiles(srpc_hw_nexe_name), 79 files=env.ExtractPublishedFiles(srpc_hw_nexe_name),
80 args=['--debug', '--enable_experimental_js']) 80 args=['--debug', '--enable_experimental_js'])
81 81
82 env.AddNodeToTestSuite(node, 82 env.AddNodeToTestSuite(node,
83 ['chrome_browser_tests'], 83 ['chrome_browser_tests'],
84 'run_srpc_hw_fd_chrome_browser_test', 84 'run_srpc_hw_fd_chrome_browser_test',
85 is_flaky=True, # Don't subject Chrome to our problems. 85 is_flaky=True, # Don't subject Chrome to our problems.
86 is_broken=env.PPAPIBrowserTesterIsBroken()) 86 is_broken=env.PPAPIBrowserTesterIsBroken())
OLDNEW
« SConstruct ('K') | « tests/srpc/nacl.scons ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698