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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: ppapi.patch

Issue 7745047: Enable browser tests with glibc. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client/
Patch Set: '' Created 9 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 | « buildbot/patch.py ('k') | tests/browser_startup_time/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
(Empty)
1 Index: native_client/tests/ppapi_example_gles2/nacl.scons
2 ===================================================================
3 --- native_client/tests/ppapi_example_gles2/nacl.scons (revision 98181)
4 +++ native_client/tests/ppapi_example_gles2/nacl.scons (working copy)
5 @@ -8,8 +8,9 @@
6 Import('env')
7
8 env.Prepend(CPPDEFINES=['XP_UNIX'])
9 -
10 env.Append(CPPPATH=['$SOURCE_ROOT/ppapi/lib/gl/include'])
11 +env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' +
12 + 'ppapi_example_gles2/')
13
14 nexe_name = 'ppapi_example_gles2_%s' % env.get('TARGET_FULLARCH')
15 obj = env.ComponentObject(
16 @@ -21,10 +22,11 @@
17
18 # Note that the html is required to run this program.
19 env.Publish(nexe_name, 'run',
20 - ['ppapi_example_gles2.html', 'ppapi_example_gles2.nmf'])
21 + ['ppapi_example_gles2.html'])
22
23 test = env.PPAPIBrowserTester('ppapi_example_gles2_test.out',
24 url='ppapi_example_gles2.html',
25 + nmfs=['${TEST_DIR}/ppapi_example_gles2.nmf'],
26 files=env.ExtractPublishedFiles(nexe_name),
27 args=['--enable_experimental_js'])
28
29 @@ -34,4 +36,4 @@
30 # TODO(cstefansen): When fixed set to
31 # env.PPAPIBrowserTesterIsBroken().
32 # code.google.com/p/nativeclient/issues/detail?id=1936
33 - is_broken=True)
34 + is_broken=env.Bit('nacl_glibc'))
35 Index: native_client/tests/ppapi_test_example/nacl.scons
36 ===================================================================
37 --- native_client/tests/ppapi_test_example/nacl.scons (revision 98181)
38 +++ native_client/tests/ppapi_test_example/nacl.scons (working copy)
39 @@ -17,6 +17,8 @@
40 Import('env')
41
42 env.Prepend(CPPDEFINES=['XP_UNIX'])
43 +env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' +
44 + 'ppapi_test_example/')
45
46 nexe = 'ppapi_test_example_%s' % env.get('TARGET_FULLARCH')
47 env.Alias('ppapi_test_example${PROGSUFFIX}',
48 @@ -34,11 +36,11 @@
49
50 env.Publish(nexe, 'run',
51 ['ppapi_test_example.html',
52 - 'ppapi_test_example.nmf',
53 'ppapi_test_example.js'])
54
55 node = env.PPAPIBrowserTester('ppapi_test_example_browser_test.out',
56 url='ppapi_test_example.html',
57 + nmfs=['${TEST_DIR}/ppapi_test_example.nmf'],
58 files=env.ExtractPublishedFiles(nexe))
59
60 env.AddNodeToTestSuite(node,
61 Index: native_client/tests/ppapi_geturl/nacl.scons
62 ===================================================================
63 --- native_client/tests/ppapi_geturl/nacl.scons (revision 98181)
64 +++ native_client/tests/ppapi_geturl/nacl.scons (working copy)
65 @@ -17,6 +17,8 @@
66 Import('env')
67
68 env.Prepend(CPPDEFINES=['XP_UNIX'])
69 +env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' +
70 + 'ppapi_geturl/')
71
72 nexe = 'ppapi_geturl_%s' % env.get('TARGET_FULLARCH')
73 env.Alias('ppapi_geturl${PROGSUFFIX}',
74 @@ -46,11 +48,11 @@
75
76 env.Publish(nexe, 'run',
77 ['ppapi_geturl.html',
78 - 'ppapi_geturl.nmf',
79 'ppapi_geturl_success.html'])
80
81 node = env.PPAPIBrowserTester('ppapi_geturl_browser_test.out',
82 url='ppapi_geturl.html',
83 + nmfs=['${TEST_DIR}/ppapi_geturl.nmf'],
84 files=env.ExtractPublishedFiles(nexe),
85 args=['--allow_404'],
86 )
87 @@ -58,5 +60,5 @@
88 env.AddNodeToTestSuite(node,
89 ['chrome_browser_tests'],
90 'run_ppapi_geturl_browser_test',
91 - is_broken=env.PPAPIBrowserTesterIsBroken()
92 - )
93 + is_broken=env.PPAPIBrowserTesterIsBroken() or
94 + env.Bit('nacl_glibc'))
95 Index: native_client/tests/ppapi_example_post_message/nacl.scons
96 ===================================================================
97 --- native_client/tests/ppapi_example_post_message/nacl.scons (revision 98181)
98 +++ native_client/tests/ppapi_example_post_message/nacl.scons (working copy)
99 @@ -8,6 +8,8 @@
100 Import('env')
101
102 env.Prepend(CPPDEFINES=['XP_UNIX'])
103 +env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' +
104 + 'ppapi_example_post_message/')
105
106 nexe_name = 'ppapi_example_post_message_${TARGET_FULLARCH}'
107 obj = env.ComponentObject(
108 @@ -19,13 +21,13 @@
109
110 # Note that the html is required to run this program.
111 env.Publish(nexe_name, 'run',
112 - ['ppapi_example_post_message.html',
113 - 'ppapi_example_post_message.nmf'])
114 + ['ppapi_example_post_message.html'])
115
116
117 test = env.PPAPIBrowserTester(
118 'ppapi_example_post_message_test.out',
119 url='ppapi_example_post_message.html',
120 + nmfs=['${TEST_DIR}/ppapi_example_post_message.nmf'],
121 files=env.ExtractPublishedFiles(nexe_name))
122
123 env.AddNodeToTestSuite(test,
124 Index: native_client/tests/ppapi_gles_book/nacl.scons
125 ===================================================================
126 --- native_client/tests/ppapi_gles_book/nacl.scons (revision 98181)
127 +++ native_client/tests/ppapi_gles_book/nacl.scons (working copy)
128 @@ -8,6 +8,8 @@
129 Import('env')
130
131 env.Prepend(CPPDEFINES=['XP_UNIX'])
132 +env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' +
133 + 'ppapi_gles_book/')
134
135 # Underlay $SOURCE_ROOT/gpu in this directory.
136 Dir('.').addRepository(Dir('#/../gpu'))
137 @@ -68,13 +70,12 @@
138 'ppapi_gles2',
139 'm'])
140 env.Publish(nexe_name, 'run',
141 - ['ppapi_gles_book.html',
142 - nmf_name])
143 + ['ppapi_gles_book.html'])
144 test = env.PPAPIBrowserTester(
145 'ppapi_gles_book_' + demo + '.out',
146 url='ppapi_gles_book.html?manifest=' + nmf_name,
147 + nmfs=['${TEST_DIR}/' + nmf_name],
148 files=[nexe,
149 - env.File(nmf_name),
150 env.File('ppapi_gles_book.html')],
151 browser_flags=['--enable-accelerated-plugins'])
152 env.AddNodeToTestSuite(
153 Index: native_client/tests/ppapi_example_audio/nacl.scons
154 ===================================================================
155 --- native_client/tests/ppapi_example_audio/nacl.scons (revision 98181)
156 +++ native_client/tests/ppapi_example_audio/nacl.scons (working copy)
157 @@ -8,6 +8,8 @@
158 Import('env')
159
160 env.Prepend(CPPDEFINES=['XP_UNIX'])
161 +env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' +
162 + 'ppapi_example_audio/')
163
164 nexe_name = 'ppapi_example_audio_%s' % env.get('TARGET_FULLARCH')
165 nexe = env.ComponentProgram(nexe_name,
166 @@ -21,10 +23,11 @@
167
168 # Note that the html is required to run this program.
169 env.Publish(nexe_name, 'run',
170 - ['ppapi_example_audio.html' , 'ppapi_example_audio.nmf'])
171 + ['ppapi_example_audio.html'])
172
173 test = env.PPAPIBrowserTester('ppapi_example_audio_test.out',
174 url='ppapi_example_audio.html#mute',
175 + nmfs=['${TEST_DIR}/ppapi_example_audio.nmf'],
176 files=[nexe,
177 env.File('ppapi_example_audio.nmf'),
178 env.File('ppapi_example_audio.html')])
179 Index: native_client/tests/ppapi_messaging/nacl.scons
180 ===================================================================
181 --- native_client/tests/ppapi_messaging/nacl.scons (revision 98181)
182 +++ native_client/tests/ppapi_messaging/nacl.scons (working copy)
183 @@ -13,6 +13,8 @@
184 Import('env')
185
186 env.Prepend(CPPDEFINES=['XP_UNIX'])
187 +env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' +
188 + 'ppapi_messaging/')
189
190 nexe = 'ppapi_messaging_%s' % env.get('TARGET_FULLARCH')
191
192 @@ -31,7 +33,6 @@
193 # Note that the html is required to run this program.
194 dest_copy = env.Replicate('$STAGING_DIR',
195 ['ppapi_messaging.html',
196 - 'ppapi_messaging.nmf',
197 env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'
198 'browserdata/nacltest.js')]
199 )
200 @@ -39,6 +40,7 @@
201
202 node = env.PPAPIBrowserTester('ppapi_messaging_browser_test.out',
203 url='ppapi_messaging.html',
204 + nmfs=['${TEST_DIR}/ppapi_messaging.nmf'],
205 files=[ppapi_messaging_nexe,
206 env.File('ppapi_messaging.nmf'),
207 env.File('ppapi_messaging.html')])
208 Index: native_client/tests/ppapi_example_font/nacl.scons
209 ===================================================================
210 --- native_client/tests/ppapi_example_font/nacl.scons (revision 98181)
211 +++ native_client/tests/ppapi_example_font/nacl.scons (working copy)
212 @@ -8,6 +8,8 @@
213 Import('env')
214
215 env.Prepend(CPPDEFINES=['XP_UNIX'])
216 +env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/' +
217 + 'ppapi_example_font/')
218
219 # Adjust compiler flags to the more forgiving standards used in
220 # ppapi/examples/*.
221 @@ -24,10 +26,11 @@
222
223 # Note that the html is required to run this program.
224 env.Publish(nexe_name, 'run',
225 - ['ppapi_example_font.html', 'ppapi_example_font.nmf'])
226 + ['ppapi_example_font.html'])
227
228 test = env.PPAPIBrowserTester('ppapi_example_font_test.out',
229 url='ppapi_example_font.html',
230 + nmfs=['${TEST_DIR}/ppapi_example_font.nmf'],
231 files=env.ExtractPublishedFiles(nexe_name))
232
233 env.AddNodeToTestSuite(test,
234 Index: native_client/tests/ppapi_browser/ppp_input_event/nacl.scons
235 ===================================================================
236 --- native_client/tests/ppapi_browser/ppp_input_event/nacl.scons (revisio n 98181)
237 +++ native_client/tests/ppapi_browser/ppp_input_event/nacl.scons (working copy)
238 @@ -8,6 +8,8 @@
239 Import('env')
240
241 env.Prepend(CPPDEFINES=['XP_UNIX'])
242 +env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
243 + 'ppp_input_event')
244
245 nexe = 'ppapi_ppp_input_event_%s' % env.get('TARGET_FULLARCH')
246 env.Alias('ppapi_ppp_input_event${PROGSUFFIX}',
247 @@ -25,11 +27,11 @@
248
249 env.Publish(nexe, 'run',
250 ['ppapi_ppp_input_event.html',
251 - 'ppapi_ppp_input_event.nmf',
252 'ppapi_ppp_input_event.js'])
253
254 node = env.PPAPIBrowserTester('ppapi_ppp_input_event_browser_test.out',
255 url='ppapi_ppp_input_event.html',
256 + nmfs=['${TEST_DIR}/ppapi_ppp_input_event.nmf'],
257 files=env.ExtractPublishedFiles(nexe))
258
259 env.AddNodeToTestSuite(node,
260 Index: native_client/tests/ppapi_browser/ppb_dev/nacl.scons
261 ===================================================================
262 --- native_client/tests/ppapi_browser/ppb_dev/nacl.scons (revision 98181)
263 +++ native_client/tests/ppapi_browser/ppb_dev/nacl.scons (working copy)
264 @@ -8,6 +8,8 @@
265 Import('env')
266
267 env.Prepend(CPPDEFINES=['XP_UNIX'])
268 +env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
269 + 'ppb_dev')
270
271 nexe = 'ppapi_ppb_dev_${TARGET_FULLARCH}'
272 env.Alias('ppapi_ppb_dev${PROGSUFFIX}',
273 @@ -25,12 +27,12 @@
274
275 env.Publish(nexe, 'run',
276 [ 'ppapi_ppb_dev.html',
277 - 'ppapi_ppb_dev.nmf',
278 env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'
279 'browserdata/nacltest.js') ])
280
281 node = env.PPAPIBrowserTester('ppapi_ppb_dev_browser_test.out',
282 url='ppapi_ppb_dev.html',
283 + nmfs=['${TEST_DIR}/ppapi_ppb_dev.nmf'],
284 files=env.ExtractPublishedFiles(nexe),
285 args=['--enable_ppapi_dev=0'])
286
287 Index: native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons
288 ===================================================================
289 --- native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons (revisio n 98181)
290 +++ native_client/tests/ppapi_browser/extension_mime_handler/nacl.scons (working copy)
291 @@ -13,6 +13,8 @@
292 Import('env')
293
294 env.Prepend(CPPDEFINES=['XP_UNIX'])
295 +env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
296 + 'extension_mime_handler')
297
298 nexe = 'ppapi_extension_mime_handler_%s' % env.get('TARGET_FULLARCH')
299
300 @@ -27,9 +29,11 @@
301
302 # Copy the extension into place (as a subdir in the staging dir).
303 dest_copy = env.Replicate('$STAGING_DIR/ppapi_extension_mime_handler',
304 - ['ppapi_extension_mime_handler.nmf',
305 - 'manifest.json',
306 + ['manifest.json',
307 env.File('$STAGING_DIR/' + nexe + '$PROGSUFFIX')])
308 +dest_copy.append(env.CopyLibsForExtension(
309 + '$STAGING_DIR/ppapi_extension_mime_handler',
310 + '$STAGING_DIR/ppapi_extension_mime_handler.nmf'))
311
312 env.Depends(env.Alias(nexe), dest_copy)
313
314 @@ -40,6 +44,7 @@
315
316 node = env.PPAPIBrowserTester('ppapi_extension_mime_handler.out',
317 url='ppapi_extension_mime_handler.html',
318 + nmfs=['${TEST_DIR}/ppapi_extension_mime_handler.nmf'],
319 extensions=[env.Dir('$STAGING_DIR/ppapi_extension_mime_handler')],
320 files=env.ExtractPublishedFiles(nexe))
321
322 Index: native_client/tests/ppapi_browser/ppp_instance/nacl.scons
323 ===================================================================
324 --- native_client/tests/ppapi_browser/ppp_instance/nacl.scons (revision 98181)
325 +++ native_client/tests/ppapi_browser/ppp_instance/nacl.scons (working copy)
326 @@ -8,6 +8,8 @@
327 Import('env')
328
329 env.Prepend(CPPDEFINES=['XP_UNIX'])
330 +env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
331 + 'ppp_instance')
332
333 nexe = 'ppapi_ppp_instance_%s' % env.get('TARGET_FULLARCH')
334 env.Alias('ppapi_ppp_instance${PROGSUFFIX}',
335 @@ -25,11 +27,11 @@
336
337 env.Publish(nexe, 'run',
338 ['ppapi_ppp_instance.html',
339 - 'ppapi_ppp_instance.nmf',
340 'ppapi_ppp_instance.js'])
341
342 node = env.PPAPIBrowserTester('ppapi_ppp_instance_browser_test.out',
343 url='ppapi_ppp_instance.html',
344 + nmfs=['${TEST_DIR}/ppapi_ppp_instance.nmf'],
345 files=env.ExtractPublishedFiles(nexe))
346
347 env.AddNodeToTestSuite(node,
348 Index: native_client/tests/ppapi_browser/ppb_widget/nacl.scons
349 ===================================================================
350 --- native_client/tests/ppapi_browser/ppb_widget/nacl.scons (revision 98181)
351 +++ native_client/tests/ppapi_browser/ppb_widget/nacl.scons (working copy)
352 @@ -7,6 +7,8 @@
353 Import('env')
354
355 env.Prepend(CPPDEFINES=['XP_UNIX'])
356 +env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
357 + 'ppb_widget')
358
359 nexe = 'ppapi_ppb_widget_%s' % env.get('TARGET_FULLARCH')
360 env.Alias('ppapi_ppb_widget${PROGSUFFIX}',
361 @@ -24,11 +26,11 @@
362
363 env.Publish(nexe, 'run',
364 ['ppapi_ppb_widget.html',
365 - 'ppapi_ppb_widget.nmf',
366 'ppapi_ppb_widget.js'])
367
368 node = env.PPAPIBrowserTester('ppapi_ppb_widget_browser_test.out',
369 url='ppapi_ppb_widget.html',
370 + nmfs=['${TEST_DIR}/ppapi_ppb_widget.nmf'],
371 files=env.ExtractPublishedFiles(nexe))
372
373 env.AddNodeToTestSuite(node,
374 Index: native_client/tests/ppapi_browser/ppb_file_system/nacl.scons
375 ===================================================================
376 --- native_client/tests/ppapi_browser/ppb_file_system/nacl.scons (revisio n 98181)
377 +++ native_client/tests/ppapi_browser/ppb_file_system/nacl.scons (working copy)
378 @@ -8,6 +8,8 @@
379 Import('env')
380
381 env.Prepend(CPPDEFINES=['XP_UNIX'])
382 +env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
383 + 'ppb_file_system')
384
385 nexe = 'ppapi_ppb_file_system_%s' % env.get('TARGET_FULLARCH')
386 env.Alias('ppapi_ppb_file_system${PROGSUFFIX}',
387 @@ -23,14 +25,15 @@
388
389 env.Publish(nexe, 'run',
390 ['ppapi_ppb_file_system.html',
391 - 'ppapi_ppb_file_system.nmf',
392 'ppapi_ppb_file_system.js'])
393
394 node = env.PPAPIBrowserTester('ppapi_ppb_file_system_browser_test.out',
395 url='ppapi_ppb_file_system.html',
396 + nmfs=['${TEST_DIR}/ppapi_ppb_file_system.nmf'],
397 files=env.ExtractPublishedFiles(nexe))
398
399 env.AddNodeToTestSuite(node,
400 ['chrome_browser_tests'],
401 'run_ppapi_ppb_file_system_browser_test',
402 - is_broken=env.PPAPIBrowserTesterIsBroken())
403 + is_broken=env.PPAPIBrowserTesterIsBroken() or
404 + env.Bit('nacl_glibc'))
405 Index: native_client/tests/ppapi_browser/ppb_scrollbar/nacl.scons
406 ===================================================================
407 --- native_client/tests/ppapi_browser/ppb_scrollbar/nacl.scons (revision 98181)
408 +++ native_client/tests/ppapi_browser/ppb_scrollbar/nacl.scons (working copy)
409 @@ -7,6 +7,8 @@
410 Import('env')
411
412 env.Prepend(CPPDEFINES=['XP_UNIX'])
413 +env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
414 + 'ppb_scrollbar')
415
416 nexe = 'ppapi_ppb_scrollbar_%s' % env.get('TARGET_FULLARCH')
417 env.Alias('ppapi_ppb_scrollbar${PROGSUFFIX}',
418 @@ -24,11 +26,11 @@
419
420 env.Publish(nexe, 'run',
421 ['ppapi_ppb_scrollbar.html',
422 - 'ppapi_ppb_scrollbar.nmf',
423 'ppapi_ppb_scrollbar.js'])
424
425 node = env.PPAPIBrowserTester('ppapi_ppb_scrollbar_browser_test.out',
426 url='ppapi_ppb_scrollbar.html',
427 + nmfs=['${TEST_DIR}/ppapi_ppb_scrollbar.nmf'],
428 files=env.ExtractPublishedFiles(nexe))
429
430 env.AddNodeToTestSuite(node,
431 Index: native_client/tests/ppapi_browser/ppb_url_request_info/nacl.scons
432 ===================================================================
433 --- native_client/tests/ppapi_browser/ppb_url_request_info/nacl.scons (revisio n 98181)
434 +++ native_client/tests/ppapi_browser/ppb_url_request_info/nacl.scons (working copy)
435 @@ -8,6 +8,8 @@
436 Import('env')
437
438 env.Prepend(CPPDEFINES=['XP_UNIX'])
439 +env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
440 + 'ppb_url_request_info')
441
442 nexe = 'ppapi_ppb_url_request_info_%s' % env.get('TARGET_FULLARCH')
443 env.Alias('ppapi_ppb_url_request_info${PROGSUFFIX}',
444 @@ -25,13 +27,14 @@
445
446 env.Publish(nexe, 'run',
447 ['ppapi_ppb_url_request_info.html',
448 - 'ppapi_ppb_url_request_info.nmf',
449 'ppapi_ppb_url_request_info.js'])
450
451 -node = env.PPAPIBrowserTester('ppapi_ppb_url_request_info_browser_test.out',
452 - url='ppapi_ppb_url_request_info.html',
453 - files=env.ExtractPublishedFiles(nexe),
454 - browser_flags=['--enable-pepper-testing'])
455 +node = env.PPAPIBrowserTester(
456 + 'ppapi_ppb_url_request_info_browser_test.out',
457 + url='ppapi_ppb_url_request_info.html',
458 + nmfs=['${TEST_DIR}/ppapi_ppb_url_request_info.nmf'],
459 + files=env.ExtractPublishedFiles(nexe),
460 + browser_flags=['--enable-pepper-testing'])
461
462 env.AddNodeToTestSuite(node,
463 ['chrome_browser_tests'],
464 Index: native_client/tests/ppapi_browser/bad/nacl.scons
465 ===================================================================
466 --- native_client/tests/ppapi_browser/bad/nacl.scons (revision 98181)
467 +++ native_client/tests/ppapi_browser/bad/nacl.scons (working copy)
468 @@ -18,6 +18,8 @@
469 # TODO(robertm): those should not be necessary once we go -std=c99
470 env.FilterOut(CFLAGS=['-pedantic'])
471 env.FilterOut(CCFLAGS=['-pedantic'])
472 +env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
473 + 'bad')
474
475 ppapi_bad_files = [
476 'ppapi_bad.html',
477 @@ -32,7 +34,7 @@
478 ]
479 ppapi_bad = env.Replicate('${STAGING_DIR}', ppapi_bad_files)
480
481 -
482 +nmfs = []
483 # Compile all nexes embedded into the above html
484 for kind in [ 'ppp_initialize', 'ppp_initialize_crash',
485 'no_ppp_instance', 'get_ppp_instance_crash',
486 @@ -40,7 +42,7 @@
487 'ppp_instance_didcreate', 'ppp_instance_didcreate_crash',
488 'event_replay_crash'
489 ]:
490 - bad_nmf = 'ppapi_bad_%s.nmf' % kind
491 + bad_nmf = '${TEST_DIR}/ppapi_bad_%s.nmf' % kind
492 bad_nexe = ('ppapi_bad_%s_%s' % (kind, env.get('TARGET_FULLARCH')))
493 env.ComponentProgram(bad_nexe,
494 ['ppapi_bad_%s.cc' % kind],
495 @@ -48,8 +50,7 @@
496 'platform',
497 'pthread',
498 'gio'])
499 -
500 - env.Publish(bad_nexe, 'run', [bad_nmf])
501 + nmfs.append(bad_nmf)
502 ppapi_bad_files.extend(env.ExtractPublishedFiles(bad_nexe))
503 env.Depends(ppapi_bad, env.Alias(bad_nexe))
504
505 @@ -60,21 +61,21 @@
506 node = env.PPAPIBrowserTester(
507 'ppapi_bad_browser_test.out',
508 url='ppapi_bad.html',
509 + nmfs=nmfs,
510 files=[env.File(f) for f in ppapi_bad_files],
511 args=['--allow_404'])
512
513 env.AddNodeToTestSuite(node,
514 ['chrome_browser_tests'],
515 'run_ppapi_bad_browser_test',
516 - is_broken=env.PPAPIBrowserTesterIsBroken())
517 + is_broken=env.PPAPIBrowserTesterIsBroken() or
518 + env.Bit('nacl_glibc'))
519
520
521 # Bad nexe tests that won't work in PNaCl (native)
522 # For example, partly_invalid.nexe has inline assembly in its source files.
523 -
524 ppapi_bad_native_files = [
525 env.File('ppapi_bad_native.html'),
526 - env.File('partly_invalid.nmf'),
527 env.File('${SCONSTRUCT_DIR}/tests/ppapi_browser/progress_events/' +
528 'ppapi_progress_events.js'),
529 env.File('${SCONSTRUCT_DIR}/tools/browser_tester/browserdata/nacltest.js')
530 @@ -88,11 +89,13 @@
531 node = env.PPAPIBrowserTester(
532 'ppapi_bad_native_test.out',
533 url='ppapi_bad_native.html',
534 + nmfs=['${TEST_DIR}/partly_invalid.nmf'],
535 files=ppapi_bad_native_files,
536 )
537
538 env.AddNodeToTestSuite(node,
539 ['chrome_browser_tests'],
540 - 'run_ppapi_bad_native_test',
541 - is_broken=env.PPAPIBrowserTesterIsBroken() or
542 - env.Bit('bitcode'))
543 + 'run_ppapi_bad_native_test',
544 + is_broken=env.PPAPIBrowserTesterIsBroken() or
545 + env.Bit('nacl_glibc') or
546 + env.Bit('bitcode'))
547 Index: native_client/tests/ppapi_browser/ppb_graphics2d/nacl.scons
548 ===================================================================
549 --- native_client/tests/ppapi_browser/ppb_graphics2d/nacl.scons (revision 98181)
550 +++ native_client/tests/ppapi_browser/ppb_graphics2d/nacl.scons (working copy)
551 @@ -8,6 +8,8 @@
552 Import('env')
553
554 env.Prepend(CPPDEFINES=['XP_UNIX'])
555 +env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
556 + 'ppb_graphics2d')
557
558 nexe = 'ppapi_ppb_graphics2d_${TARGET_FULLARCH}'
559 env.Alias('ppapi_ppb_graphics2d${PROGSUFFIX}',
560 @@ -25,15 +27,14 @@
561
562 dest_copy = env.Publish(nexe, 'run',
563 [ 'ppapi_ppb_graphics2d.html',
564 - 'ppapi_ppb_graphics2d.nmf',
565 env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'
566 'browserdata/nacltest.js') ]
567 )
568
569 node = env.PPAPIBrowserTester('ppapi_ppb_graphics2d_browser_test.out',
570 url='ppapi_ppb_graphics2d.html',
571 + nmfs=['${TEST_DIR}/ppapi_ppb_graphics2d.nmf'],
572 files=[ ppapi_ppb_graphics2d_nexe,
573 - env.File('ppapi_ppb_graphics2d.nmf'),
574 env.File('ppapi_ppb_graphics2d.html')],
575 browser_flags=['--enable-pepper-testing'])
576
577 Index: native_client/tests/ppapi_browser/progress_events/nacl.scons
578 ===================================================================
579 --- native_client/tests/ppapi_browser/progress_events/nacl.scons (revisio n 98181)
580 +++ native_client/tests/ppapi_browser/progress_events/nacl.scons (working copy)
581 @@ -8,6 +8,8 @@
582 # TODO(robertm): those should not be necessary once we go -std=c99
583 env.FilterOut(CFLAGS=['-pedantic'])
584 env.FilterOut(CCFLAGS=['-pedantic'])
585 +env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
586 + 'progress_events')
587
588 progress_events_sources = env.ComponentObject('ppapi_progress_events.cc'),
589
590 @@ -24,7 +26,6 @@
591 # Needed by other tests using progress events.
592 env.Publish(progress_events_target, 'run', [
593 'ppapi_progress_events.html',
594 - 'ppapi_progress_events.nmf',
595 ('${SCONSTRUCT_DIR}/tests/ppapi_browser/progress_events/' +
596 'ppapi_progress_events.js'),
597 '${SCONSTRUCT_DIR}/tools/browser_tester/browserdata/nacltest.js',
598 @@ -33,6 +34,7 @@
599 node = env.PPAPIBrowserTester(
600 'ppapi_progress_events_browser_test.out',
601 url='ppapi_progress_events.html',
602 + nmfs=['${TEST_DIR}/ppapi_progress_events.nmf'],
603 files=env.ExtractPublishedFiles(progress_events_target))
604
605 env.AddNodeToTestSuite(node,
606 Index: native_client/tests/ppapi_browser/ppb_graphics3d/nacl.scons
607 ===================================================================
608 --- native_client/tests/ppapi_browser/ppb_graphics3d/nacl.scons (revision 98181)
609 +++ native_client/tests/ppapi_browser/ppb_graphics3d/nacl.scons (working copy)
610 @@ -8,6 +8,8 @@
611 Import('env')
612
613 env.Prepend(CPPDEFINES=['XP_UNIX'])
614 +env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
615 + 'ppb_graphics3d')
616
617 env.Append(CPPPATH=['$SOURCE_ROOT/ppapi/lib/gl/include'])
618
619 @@ -28,14 +30,13 @@
620
621 dest_copy = env.Publish(nexe, 'run',
622 [ 'ppapi_ppb_graphics3d.html',
623 - 'ppapi_ppb_graphics3d.nmf',
624 env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'
625 'browserdata/nacltest.js') ])
626
627 node = env.PPAPIBrowserTester('ppapi_ppb_graphics3d_browser_test.out',
628 url='ppapi_ppb_graphics3d.html',
629 + nmfs=['${TEST_DIR}/ppapi_ppb_graphics3d.nmf'],
630 files=[ ppapi_ppb_graphics3d_nexe,
631 - env.File('ppapi_ppb_graphics3d.nmf'),
632 env.File('ppapi_ppb_graphics3d.html')],
633 browser_flags=['--enable-accelerated-plugins'])
634
635 Index: native_client/tests/ppapi_browser/ppb_var/nacl.scons
636 ===================================================================
637 --- native_client/tests/ppapi_browser/ppb_var/nacl.scons (revision 98181)
638 +++ native_client/tests/ppapi_browser/ppb_var/nacl.scons (working copy)
639 @@ -8,6 +8,8 @@
640 Import('env')
641
642 env.Prepend(CPPDEFINES=['XP_UNIX'])
643 +env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
644 + 'ppb_var')
645
646 nexe = 'ppapi_ppb_var_%s' % env.get('TARGET_FULLARCH')
647 env.Alias('ppapi_ppb_var${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe] )
648 @@ -24,12 +26,12 @@
649 # Note that the html is required to run this program.
650 env.Publish(nexe, 'run',
651 ['ppapi_ppb_var.html',
652 - 'ppapi_ppb_var.nmf',
653 env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'
654 'browserdata/nacltest.js')])
655
656 node = env.PPAPIBrowserTester('ppapi_ppb_var_browser_test.out',
657 url='ppapi_ppb_var.html',
658 + nmfs=['${TEST_DIR}/ppapi_ppb_var.nmf'],
659 files=env.ExtractPublishedFiles(nexe))
660
661 env.AddNodeToTestSuite(node,
662 Index: native_client/tests/ppapi_browser/ppb_core/nacl.scons
663 ===================================================================
664 --- native_client/tests/ppapi_browser/ppb_core/nacl.scons (revision 98181)
665 +++ native_client/tests/ppapi_browser/ppb_core/nacl.scons (working copy)
666 @@ -8,9 +8,12 @@
667 Import('env')
668
669 env.Prepend(CPPDEFINES=['XP_UNIX'])
670 +env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
671 + 'ppb_core')
672
673 nexe = 'ppapi_ppb_core_%s' % env.get('TARGET_FULLARCH')
674 -env.Alias('ppapi_ppb_core${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe ])
675 +env.Alias('ppapi_ppb_core${PROGSUFFIX}',
676 + ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe])
677
678 env.ComponentProgram(
679 nexe,
680 @@ -24,15 +27,16 @@
681 # Note that the html is required to run this program.
682 env.Publish(nexe, 'run',
683 ['ppapi_ppb_core.html',
684 - 'ppapi_ppb_core.nmf',
685 env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'
686 'browserdata/nacltest.js')])
687
688 node = env.PPAPIBrowserTester('ppapi_ppb_core_browser_test.out',
689 url='ppapi_ppb_core.html',
690 + nmfs=['${TEST_DIR}/ppapi_ppb_core.nmf'],
691 files=env.ExtractPublishedFiles(nexe))
692
693 env.AddNodeToTestSuite(node,
694 ['chrome_browser_tests'],
695 'run_ppapi_ppb_core_browser_test',
696 - is_broken=env.PPAPIBrowserTesterIsBroken())
697 + is_broken=env.PPAPIBrowserTesterIsBroken() or
698 + env.Bit('nacl_glibc'))
699 Index: native_client/tests/ppapi_browser/ppb_url_loader/nacl.scons
700 ===================================================================
701 --- native_client/tests/ppapi_browser/ppb_url_loader/nacl.scons (revision 98181)
702 +++ native_client/tests/ppapi_browser/ppb_url_loader/nacl.scons (working copy)
703 @@ -8,6 +8,8 @@
704 Import('env')
705
706 env.Prepend(CPPDEFINES=['XP_UNIX'])
707 +env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
708 + 'ppb_url_loader')
709
710 nexe = 'ppapi_ppb_url_loader_%s' % env.get('TARGET_FULLARCH')
711 env.Alias('ppapi_ppb_url_loader${PROGSUFFIX}',
712 @@ -23,12 +25,12 @@
713
714 env.Publish(nexe, 'run',
715 ['ppapi_ppb_url_loader.html',
716 - 'ppapi_ppb_url_loader.nmf',
717 'ppapi_ppb_url_loader.js',
718 'ppapi_ppb_url_loader.txt'])
719
720 node = env.PPAPIBrowserTester('ppapi_ppb_url_loader_browser_test.out',
721 url='ppapi_ppb_url_loader.html',
722 + nmfs=['${TEST_DIR}/ppapi_ppb_url_loader.nmf'],
723 files=env.ExtractPublishedFiles(nexe),
724 args=['--allow_404',
725 '--redirect_url',
726 Index: native_client/tests/ppapi_browser/crash/nacl.scons
727 ===================================================================
728 --- native_client/tests/ppapi_browser/crash/nacl.scons (revision 98181)
729 +++ native_client/tests/ppapi_browser/crash/nacl.scons (working copy)
730 @@ -11,10 +11,13 @@
731 Import('env')
732
733 env.Prepend(CPPDEFINES=['XP_UNIX'])
734 +env.Replace(
735 + TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/crash')
736
737 crash_types = ['via_check_failure', 'via_exit_call', 'in_callback']
738 published_files = []
739
740 +nmfs = []
741 for crash_type in crash_types:
742 nexe = 'ppapi_crash_%s_%s' % (crash_type, env.get('TARGET_FULLARCH'))
743 env.Alias('ppapi_crash_%s${PROGSUFFIX}' % crash_type,
744 @@ -32,17 +35,19 @@
745 # TODO(polina): follow ppapi_browser/bad nacl.scons to publish html only once
746 # and to associate all nexes and nmf files with one target that can be
747 # referenced in tests/nacl.scons.
748 + nmfs.append('${TEST_DIR}/ppapi_crash_%s.nmf' % crash_type)
749 env.Publish(nexe, 'run',
750 - ['ppapi_crash.html',
751 - 'ppapi_crash_%s.nmf' % crash_type ])
752 + ['ppapi_crash.html'])
753
754 published_files.extend(env.ExtractPublishedFiles(nexe))
755
756 node = env.PPAPIBrowserTester('ppapi_crash_browser_test.out',
757 url='ppapi_crash.html',
758 + nmfs=nmfs,
759 files=published_files)
760
761 env.AddNodeToTestSuite(node,
762 ['chrome_browser_tests'],
763 'run_ppapi_crash_browser_test',
764 - is_broken=env.PPAPIBrowserTesterIsBroken())
765 + is_broken=env.PPAPIBrowserTesterIsBroken() or
766 + env.Bit('nacl_glibc'))
767 Index: native_client/tests/ppapi_browser/ppb_instance/nacl.scons
768 ===================================================================
769 --- native_client/tests/ppapi_browser/ppb_instance/nacl.scons (revision 98181)
770 +++ native_client/tests/ppapi_browser/ppb_instance/nacl.scons (working copy)
771 @@ -8,6 +8,8 @@
772 Import('env')
773
774 env.Prepend(CPPDEFINES=['XP_UNIX'])
775 +env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
776 + 'ppb_instance')
777
778 nexe = 'ppapi_ppb_instance_%s' % env.get('TARGET_FULLARCH')
779 env.Alias('ppapi_ppb_instance${PROGSUFFIX}', ['$STAGING_DIR/%s${PROGSUFFIX}' % nexe])
780 @@ -24,12 +26,12 @@
781 # Note that the html is required to run this program.
782 env.Publish(nexe, 'run',
783 ['ppapi_ppb_instance.html',
784 - 'ppapi_ppb_instance.nmf',
785 env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'
786 'browserdata/nacltest.js')])
787
788 node = env.PPAPIBrowserTester('ppapi_ppb_instance_browser_test.out',
789 url='ppapi_ppb_instance.html',
790 + nmfs=['${TEST_DIR}/ppapi_ppb_instance.nmf'],
791 files=env.ExtractPublishedFiles(nexe))
792
793 env.AddNodeToTestSuite(node,
794 Index: native_client/tests/ppapi_browser/manifest/nacl.scons
795 ===================================================================
796 --- native_client/tests/ppapi_browser/manifest/nacl.scons (revision 98181)
797 +++ native_client/tests/ppapi_browser/manifest/nacl.scons (working copy)
798 @@ -8,6 +8,8 @@
799 # TODO(robertm): those should not be necessary once we go -std=c99
800 env.FilterOut(CFLAGS=['-pedantic'])
801 env.FilterOut(CCFLAGS=['-pedantic'])
802 +env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
803 + 'manifest')
804
805 manifest_good_sources = env.ComponentObject('manifest_good.cc'),
806
807 @@ -36,26 +38,31 @@
808 env.Publish(manifest_good_target, 'run', [
809 'manifest.html',
810 manifest_bad_target,
811 - 'manifest_top.nmf',
812 - 'manifest_subdir.nmf',
813 ('${SCONSTRUCT_DIR}/tests/ppapi_browser/progress_events/' +
814 'ppapi_progress_events.js'),
815 '${SCONSTRUCT_DIR}/tools/browser_tester/browserdata/nacltest.js',
816 ])
817
818 +file_mapping = []
819 +if env.Bit('nacl_glibc'):
820 + file_mapping.append(
821 + ('subdir/runnable-ld.so',env.File('${NACL_SDK_LIB}/runnable-ld.so')))
822 +file_mapping += [
823 + ('subdir/manifest_subdir.nmf',
824 + env.File('${STAGING_DIR}/manifest_subdir.nmf')),
825 + # the 'good' nexe in the root directory will fail.
826 + (manifest_good_target + env['PROGSUFFIX'],
827 + env.File('${STAGING_DIR}/%s${PROGSUFFIX}' % manifest_bad_target)),
828 + # the 'good' nexe in the subdirectory will succeed.
829 + ('subdir/' + manifest_good_target + env['PROGSUFFIX'],
830 + env.File('${STAGING_DIR}/%s${PROGSUFFIX}' % manifest_good_target))]
831 +
832 node = env.PPAPIBrowserTester(
833 'manifest_browser_test.out',
834 url='manifest.html',
835 + nmfs=['${TEST_DIR}/manifest_top.nmf', '${TEST_DIR}/manifest_subdir.nmf'],
836 files=env.ExtractPublishedFiles(manifest_good_target),
837 - map_files=[
838 - ('subdir/manifest_subdir.nmf',
839 - env.File('${STAGING_DIR}/manifest_subdir.nmf')),
840 - # the 'good' nexe in the root directory will fail.
841 - (manifest_good_target + env['PROGSUFFIX'],
842 - env.File('${STAGING_DIR}/%s${PROGSUFFIX}' % manifest_bad_target)),
843 - # the 'good' nexe in the subdirectory will succeed.
844 - ('subdir/' + manifest_good_target + env['PROGSUFFIX'],
845 - env.File('${STAGING_DIR}/%s${PROGSUFFIX}' % manifest_good_target))])
846 + map_files=file_mapping)
847
848 env.AddNodeToTestSuite(node,
849 ['chrome_browser_tests'],
850 Index: native_client/tests/ppapi_browser/ppb_file_io/nacl.scons
851 ===================================================================
852 --- native_client/tests/ppapi_browser/ppb_file_io/nacl.scons (revision 98181)
853 +++ native_client/tests/ppapi_browser/ppb_file_io/nacl.scons (working copy)
854 @@ -8,6 +8,8 @@
855 Import('env')
856
857 env.Prepend(CPPDEFINES=['XP_UNIX'])
858 +env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
859 + 'ppb_file_io')
860
861 nexe = 'ppapi_ppb_file_io_%s' % env.get('TARGET_FULLARCH')
862 env.Alias('ppapi_ppb_file_io${PROGSUFFIX}',
863 @@ -28,11 +30,11 @@
864
865 env.Publish(nexe, 'run',
866 ['ppapi_ppb_file_io.html',
867 - 'ppapi_ppb_file_io.nmf',
868 'ppapi_ppb_file_io.js'])
869
870 node = env.PPAPIBrowserTester('ppapi_ppb_file_io_browser_test.out',
871 url='ppapi_ppb_file_io.html',
872 + nmfs=['${TEST_DIR}/ppapi_ppb_file_io.nmf'],
873 browser_flags=['--unlimited-quota-for-files'],
874 files=env.ExtractPublishedFiles(nexe))
875
876 Index: native_client/tests/ppapi_browser/ppb_memory/nacl.scons
877 ===================================================================
878 --- native_client/tests/ppapi_browser/ppb_memory/nacl.scons (revision 98181)
879 +++ native_client/tests/ppapi_browser/ppb_memory/nacl.scons (working copy)
880 @@ -8,6 +8,8 @@
881 Import('env')
882
883 env.Prepend(CPPDEFINES=['XP_UNIX'])
884 +env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
885 + 'ppb_memory')
886
887 nexe = 'ppapi_ppb_memory_%s' % env.get('TARGET_FULLARCH')
888 env.Alias('ppapi_ppb_memory${PROGSUFFIX}',
889 @@ -24,11 +26,11 @@
890 ])
891
892 env.Publish(nexe, 'run',
893 - ['ppapi_ppb_memory.html',
894 - 'ppapi_ppb_memory.nmf'])
895 + ['ppapi_ppb_memory.html'])
896
897 node = env.PPAPIBrowserTester('ppapi_ppb_memory_browser_test.out',
898 url='ppapi_ppb_memory.html',
899 + nmfs=['${TEST_DIR}/ppapi_ppb_memory.nmf'],
900 files=env.ExtractPublishedFiles(nexe))
901
902 env.AddNodeToTestSuite(node,
903 Index: native_client/tests/ppapi_browser/ppb_pdf/nacl.scons
904 ===================================================================
905 --- native_client/tests/ppapi_browser/ppb_pdf/nacl.scons (revision 98181)
906 +++ native_client/tests/ppapi_browser/ppb_pdf/nacl.scons (working copy)
907 @@ -7,6 +7,8 @@
908 Import('env')
909
910 env.Prepend(CPPDEFINES=['XP_UNIX'])
911 +env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
912 + 'ppb_pdf')
913
914 nexe = 'ppapi_ppb_pdf_%s' % env.get('TARGET_FULLARCH')
915 env.Alias('ppapi_ppb_pdf${PROGSUFFIX}',
916 @@ -24,11 +26,11 @@
917
918 env.Publish(nexe, 'run',
919 ['ppapi_ppb_pdf.html',
920 - 'ppapi_ppb_pdf.nmf',
921 'ppapi_ppb_pdf.js'])
922
923 node = env.PPAPIBrowserTester('ppapi_ppb_pdf_browser_test.out',
924 url='ppapi_ppb_pdf.html',
925 + nmfs=['${TEST_DIR}/ppapi_ppb_pdf.nmf'],
926 files=env.ExtractPublishedFiles(nexe))
927
928 env.AddNodeToTestSuite(node,
929 Index: native_client/tests/ppapi_browser/ppb_image_data/nacl.scons
930 ===================================================================
931 --- native_client/tests/ppapi_browser/ppb_image_data/nacl.scons (revision 98181)
932 +++ native_client/tests/ppapi_browser/ppb_image_data/nacl.scons (working copy)
933 @@ -8,6 +8,8 @@
934 Import('env')
935
936 env.Prepend(CPPDEFINES=['XP_UNIX'])
937 +env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
938 + 'ppb_image_data')
939
940 nexe = 'ppapi_ppb_image_data_${TARGET_FULLARCH}'
941 env.Alias('ppapi_ppb_image_data${PROGSUFFIX}',
942 @@ -25,12 +27,12 @@
943
944 env.Publish(nexe, 'run',
945 [ 'ppapi_ppb_image_data.html',
946 - 'ppapi_ppb_image_data.nmf',
947 env.File('${SCONSTRUCT_DIR}/tools/browser_tester/'
948 'browserdata/nacltest.js') ])
949
950 node = env.PPAPIBrowserTester('ppapi_ppb_image_data_browser_test.out',
951 url='ppapi_ppb_image_data.html',
952 + nmfs=['${TEST_DIR}/ppapi_ppb_image_data.nmf'],
953 files=env.ExtractPublishedFiles(nexe))
954
955 env.AddNodeToTestSuite(node,
OLDNEW
« no previous file with comments | « buildbot/patch.py ('k') | tests/browser_startup_time/nacl.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698