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

Side by Side Diff: ppapi/native_client/tests/ppapi_browser/manifest/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 'manifest') 12 'manifest')
13 13
14 manifest_good_sources = env.ComponentObject('manifest_good.cc'), 14 manifest_good_sources = env.ComponentObject('manifest_good.cc'),
15 15
16 manifest_good_target = env.ProgramNameForNmf('manifest_good') 16 manifest_good_target = env.ProgramNameForNmf('manifest_good')
17 env.ComponentProgram(manifest_good_target, 17 env.ComponentProgram(manifest_good_target,
18 [manifest_good_sources], 18 [manifest_good_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 manifest_bad_sources = env.ComponentObject('manifest_bad.cc'), 25 manifest_bad_sources = env.ComponentObject('manifest_bad.cc'),
26 26
27 manifest_bad_target = env.ProgramNameForNmf('manifest_bad') 27 manifest_bad_target = env.ProgramNameForNmf('manifest_bad')
28 env.ComponentProgram(manifest_bad_target, 28 env.ComponentProgram(manifest_bad_target,
29 [manifest_bad_sources], 29 [manifest_bad_sources],
30 EXTRA_LIBS=['${PPAPI_LIBS}', 30 EXTRA_LIBS=['ppapi',
31 'ppapi_test_lib', 31 'ppapi_test_lib',
32 'pthread', 32 'pthread',
33 'platform', 33 'platform',
34 'gio']) 34 'gio'])
35 35
36 env.Publish(manifest_good_target, 'run', [ 36 env.Publish(manifest_good_target, 'run', [
37 'manifest.html', 37 'manifest.html',
38 manifest_bad_target, 38 manifest_bad_target,
39 ('${SCONSTRUCT_DIR}/tests/ppapi_browser/progress_events/' + 39 ('${SCONSTRUCT_DIR}/tests/ppapi_browser/progress_events/' +
40 'ppapi_progress_events.js'), 40 'ppapi_progress_events.js'),
(...skipping 18 matching lines...) Expand all
59 'manifest_browser_test.out', 59 'manifest_browser_test.out',
60 url='manifest.html', 60 url='manifest.html',
61 nmfs=['${TEST_DIR}/manifest_top.nmf', '${TEST_DIR}/manifest_subdir.nmf'], 61 nmfs=['${TEST_DIR}/manifest_top.nmf', '${TEST_DIR}/manifest_subdir.nmf'],
62 files=env.ExtractPublishedFiles(manifest_good_target), 62 files=env.ExtractPublishedFiles(manifest_good_target),
63 map_files=file_mapping) 63 map_files=file_mapping)
64 64
65 env.AddNodeToTestSuite(node, 65 env.AddNodeToTestSuite(node,
66 ['chrome_browser_tests'], 66 ['chrome_browser_tests'],
67 'run_manifest_browser_test', 67 'run_manifest_browser_test',
68 is_broken=env.PPAPIBrowserTesterIsBroken()) 68 is_broken=env.PPAPIBrowserTesterIsBroken())
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698