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

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

Issue 6452010: Remove the x-ppapi-nacl-srpc and x-nacl-srpc mime types in favor of the singl... (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client/
Patch Set: '' Created 9 years, 10 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/srpc/examples_ppapi.html ('k') | tests/srpc/srpc_basic.html » ('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 2008 The Native Client Authors. All rights reserved. 2 # Copyright 2008 The Native Client Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can 3 # Use of this source code is governed by a BSD-style license that can
4 # be found in the LICENSE file. 4 # be found in the LICENSE file.
5 5
6 import platform 6 import platform
7 7
8 Import('env') 8 Import('env')
9 9
10 10
11 # In Chrome, we can share the nexe between the NPAPI (built-in) and
12 # PPAPI (loaded with --register-pepper-plugins) versions of NaCl, but the html
13 # needs to be different to specify different plugin content types:
14 # "application/x-nacl-srpc" for srpc nexes with NPAPI plugin and
15 # "application/x-ppapi-nacl-srpc" for for srpc nexes with PPAPI plugin.
16 # TODO(polina): at some point there should only be "application/x-nacl".
17
18
19 ###################################################################### 11 ######################################################################
20 # Simple RPC basic methods tests 12 # Simple RPC basic methods tests
21 ###################################################################### 13 ######################################################################
22 srpc_test_nexe = env.ComponentProgram('srpc_test.nexe', 'srpc_test.c', 14 srpc_test_nexe = env.ComponentProgram('srpc_test.nexe', 'srpc_test.c',
23 EXTRA_LIBS=['srpc', 'm', 'pthread']) 15 EXTRA_LIBS=['srpc', 'm', 'pthread'])
24 env.Publish('srpc_test.nexe', 'run', 16 env.Publish('srpc_test.nexe', 'run',
25 ['srpc_basic.html', 'srpc_perf.html', 'srpc_shm.html', 17 ['srpc_basic.html', 'srpc_perf.html', 'srpc_shm.html',
26 'srpc_plugin.html', 18 'srpc_plugin.html',
27 env.File('${SCONSTRUCT_DIR}/tests/nacl_js_lib.js') ]) 19 env.File('${SCONSTRUCT_DIR}/tests/nacl_js_lib.js') ])
28 env.Publish('srpc_test.nexe', 'run', 20 env.Publish('srpc_test.nexe', 'run',
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 'srpc_shm_browser_ppapi_test.out', 236 'srpc_shm_browser_ppapi_test.out',
245 url='srpc_shm_ppapi.html', 237 url='srpc_shm_ppapi.html',
246 files=[srpc_shm_nexe, 238 files=[srpc_shm_nexe,
247 env.File('srpc_shm_ppapi.html'), 239 env.File('srpc_shm_ppapi.html'),
248 env.File('${SCONSTRUCT_DIR}/tests/nacl_js_lib.js'), 240 env.File('${SCONSTRUCT_DIR}/tests/nacl_js_lib.js'),
249 ], 241 ],
250 ) 242 )
251 env.AddNodeToTestSuite(node, 243 env.AddNodeToTestSuite(node,
252 ['pepper_browser_tests'], 244 ['pepper_browser_tests'],
253 'run_srpc_shm_ppapi_browser_test') 245 'run_srpc_shm_ppapi_browser_test')
OLDNEW
« no previous file with comments | « tests/srpc/examples_ppapi.html ('k') | tests/srpc/srpc_basic.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698