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

Side by Side Diff: ppapi/native_client/tests/ppapi_browser/progress_events/nacl.scons

Issue 10868029: Inlining PPAPI_LIBS as its now the same everywhere. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge 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
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 # TODO(robertm): those should not be necessary once we go -std=c99 8 # TODO(robertm): those should not be necessary once we go -std=c99
9 env.FilterOut(CFLAGS=['-pedantic']) 9 env.FilterOut(CFLAGS=['-pedantic'])
10 env.FilterOut(CCFLAGS=['-pedantic']) 10 env.FilterOut(CCFLAGS=['-pedantic'])
11 env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' + 11 env.Replace(TEST_DIR='${SOURCE_ROOT}/ppapi/native_client/tests/ppapi_browser/' +
12 'progress_events') 12 'progress_events')
13 13
14 progress_events_sources = env.ComponentObject('ppapi_progress_events.cc'), 14 progress_events_sources = env.ComponentObject('ppapi_progress_events.cc'),
15 15
16 progress_events_target = env.ProgramNameForNmf('ppapi_progress_events') 16 progress_events_target = env.ProgramNameForNmf('ppapi_progress_events')
17 env.ComponentProgram(progress_events_target, 17 env.ComponentProgram(progress_events_target,
18 [progress_events_sources], 18 [progress_events_sources],
19 EXTRA_LIBS=['${PPAPI_LIBS}', 19 EXTRA_LIBS=['ppapi',
20 'ppapi_test_lib', 20 'ppapi_test_lib',
21 'pthread', 21 'pthread',
22 'platform', 22 'platform',
23 'gio']) 23 'gio'])
24 24
25 # Needed by other tests using progress events. 25 # Needed by other tests using progress events.
26 env.Publish(progress_events_target, 'run', [ 26 env.Publish(progress_events_target, 'run', [
27 'ppapi_progress_events.html', 27 'ppapi_progress_events.html',
28 ('${SCONSTRUCT_DIR}/tests/ppapi_browser/progress_events/' + 28 ('${SCONSTRUCT_DIR}/tests/ppapi_browser/progress_events/' +
29 'ppapi_progress_events.js'), 29 'ppapi_progress_events.js'),
30 '${SCONSTRUCT_DIR}/tools/browser_tester/browserdata/nacltest.js', 30 '${SCONSTRUCT_DIR}/tools/browser_tester/browserdata/nacltest.js',
31 ]) 31 ])
32 32
33 node = env.PPAPIBrowserTester( 33 node = env.PPAPIBrowserTester(
34 'ppapi_progress_events_browser_test.out', 34 'ppapi_progress_events_browser_test.out',
35 url='ppapi_progress_events.html', 35 url='ppapi_progress_events.html',
36 nmf_names=['ppapi_progress_events'], 36 nmf_names=['ppapi_progress_events'],
37 files=env.ExtractPublishedFiles(progress_events_target)) 37 files=env.ExtractPublishedFiles(progress_events_target))
38 38
39 env.AddNodeToTestSuite(node, 39 env.AddNodeToTestSuite(node,
40 ['chrome_browser_tests'], 40 ['chrome_browser_tests'],
41 'run_ppapi_progress_events_browser_test', 41 'run_ppapi_progress_events_browser_test',
42 is_broken=env.PPAPIBrowserTesterIsBroken()) 42 is_broken=env.PPAPIBrowserTesterIsBroken())
OLDNEW
« no previous file with comments | « ppapi/native_client/tests/ppapi_browser/ppp_instance/nacl.scons ('k') | ppapi/native_client/tests/ppapi_example_2d/nacl.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698