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

Side by Side Diff: ppapi/native_client/tests/earth/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: 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
« no previous file with comments | « no previous file | ppapi/native_client/tests/ppapi_browser/bad/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
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 if (not env.Bit('bitcode')): 8 if (not env.Bit('bitcode')):
9 flags = ['-mfpmath=sse', '-msse2', '-O3', '-ffast-math', 9 flags = ['-mfpmath=sse', '-msse2', '-O3', '-ffast-math',
10 '-fomit-frame-pointer'] 10 '-fomit-frame-pointer']
11 env.Append(CCFLAGS=flags) 11 env.Append(CCFLAGS=flags)
12 env.Append(CXXFLAGS=flags) 12 env.Append(CXXFLAGS=flags)
13 13
14 earthlib = env.ComponentLibrary('earthlib', ['earth.cc']) 14 earthlib = env.ComponentLibrary('earthlib', ['earth.cc'])
15 15
16 # build, C then C++ 16 # build, C then C++
17 cobj=['pepper_c.c'] 17 cobj=['pepper_c.c']
18 c_nexe_name = env.ProgramNameForNmf('earth_c') 18 c_nexe_name = env.ProgramNameForNmf('earth_c')
19 cnexe = env.ComponentProgram(c_nexe_name, cobj, 19 cnexe = env.ComponentProgram(c_nexe_name, cobj,
20 EXTRA_LIBS=['earthlib', 20 EXTRA_LIBS=['earthlib',
21 '${PPAPI_LIBS}', 21 'ppapi',
22 'm', 'pthread']) 22 'm', 'pthread'])
23 env.Publish(c_nexe_name, 'run', ['earth_c.html']) 23 env.Publish(c_nexe_name, 'run', ['earth_c.html'])
24 24
25 node = env.DemoSelLdrNacl('demo_earth_c', cnexe, args=[]) 25 node = env.DemoSelLdrNacl('demo_earth_c', cnexe, args=[])
26 # Note: Make this available from top level 26 # Note: Make this available from top level
27 Alias('demo_earth_c', node) 27 Alias('demo_earth_c', node)
28 28
29 ccobj=['pepper_cc.cc'] 29 ccobj=['pepper_cc.cc']
30 cc_nexe_name = env.ProgramNameForNmf('earth_cc') 30 cc_nexe_name = env.ProgramNameForNmf('earth_cc')
31 ccnexe = env.ComponentProgram(cc_nexe_name, ccobj, 31 ccnexe = env.ComponentProgram(cc_nexe_name, ccobj,
32 EXTRA_LIBS=['earthlib', 32 EXTRA_LIBS=['earthlib',
33 '${PPAPI_LIBS}', 33 'ppapi',
34 'ppapi_cpp',
Mark Seaborn 2012/08/22 21:04:32 You dropped ppapi_cpp. Did you mean to drop ppapi
bradn 2012/08/22 21:09:17 Yes, this was a textual error. Amusingly this one
35 'm', 'pthread']) 34 'm', 'pthread'])
36 env.Publish(cc_nexe_name, 'run', ['earth_cc.html']) 35 env.Publish(cc_nexe_name, 'run', ['earth_cc.html'])
37 36
38 node = env.DemoSelLdrNacl('demo_earth_cc', ccnexe, args=[]) 37 node = env.DemoSelLdrNacl('demo_earth_cc', ccnexe, args=[])
39 # Note: Make this available from top level 38 # Note: Make this available from top level
40 Alias('demo_earth_cc', node) 39 Alias('demo_earth_cc', node)
41 40
42 41
43 # Validator tests, C then C++, but not for glibc 42 # Validator tests, C then C++, but not for glibc
44 # TODO(bradchen): enable these tests when ncval works with glibc DSOs 43 # TODO(bradchen): enable these tests when ncval works with glibc DSOs
(...skipping 24 matching lines...) Expand all
69 env.AddNodeToTestSuite(node, ['chrome_browser_tests'], 'earth_browser_test_c') 68 env.AddNodeToTestSuite(node, ['chrome_browser_tests'], 'earth_browser_test_c')
70 69
71 node = env.PPAPIBrowserTester( 70 node = env.PPAPIBrowserTester(
72 'earth_browser_test_cc.out', 71 'earth_browser_test_cc.out',
73 url='earth_cc.html', 72 url='earth_cc.html',
74 nmf_names=['earth_cc'], 73 nmf_names=['earth_cc'],
75 files=env.ExtractPublishedFiles(cc_nexe_name), 74 files=env.ExtractPublishedFiles(cc_nexe_name),
76 is_broken=env.PPAPIBrowserTesterIsBroken()) 75 is_broken=env.PPAPIBrowserTesterIsBroken())
77 76
78 env.AddNodeToTestSuite(node, ['chrome_browser_tests'], 'earth_browser_test_cc') 77 env.AddNodeToTestSuite(node, ['chrome_browser_tests'], 'earth_browser_test_cc')
OLDNEW
« no previous file with comments | « no previous file | ppapi/native_client/tests/ppapi_browser/bad/nacl.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698