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

Side by Side Diff: ppapi/native_client/tests/ppapi_tests/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
« no previous file with comments | « ppapi/native_client/tests/ppapi_test_example/nacl.scons ('k') | no next file » | 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) 2011 The Native Client Authors. All rights reserved. 2 # Copyright (c) 2011 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 import os 7 import os
8 8
9 if env.Bit('nacl_glibc'): 9 if env.Bit('nacl_glibc'):
10 Return() 10 Return()
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 # causes object files to end up in the wrong directory. 83 # causes object files to end up in the wrong directory.
84 def MakeComponentObject(src): 84 def MakeComponentObject(src):
85 return env.ComponentObject( 85 return env.ComponentObject(
86 os.path.splitext(src)[0], 86 os.path.splitext(src)[0],
87 os.path.join('$SOURCE_ROOT/ppapi/tests', src)) 87 os.path.join('$SOURCE_ROOT/ppapi/tests', src))
88 88
89 ppapi_tests_objs = [MakeComponentObject(src) for src in ppapi_tests_sources] 89 ppapi_tests_objs = [MakeComponentObject(src) for src in ppapi_tests_sources]
90 90
91 ppapi_tests_nexe = env.ComponentProgram(ppapi_tests_target, 91 ppapi_tests_nexe = env.ComponentProgram(ppapi_tests_target,
92 ppapi_tests_objs, 92 ppapi_tests_objs,
93 EXTRA_LIBS=['${PPAPI_LIBS}', 93 EXTRA_LIBS=['ppapi',
94 'ppapi_cpp' 94 'ppapi_cpp'
95 ]) 95 ])
96 96
97 # Note that the html is required to run this program. 97 # Note that the html is required to run this program.
98 # To run, load page with mode=nacl search string: 98 # To run, load page with mode=nacl search string:
99 # http://localhost:5103/scons-out/nacl-x86-32/staging/test_case.html?mode=nacl 99 # http://localhost:5103/scons-out/nacl-x86-32/staging/test_case.html?mode=nacl
100 # http://localhost:5103/scons-out/nacl-x86-64/staging/test_case.html?mode=nacl 100 # http://localhost:5103/scons-out/nacl-x86-64/staging/test_case.html?mode=nacl
101 101
102 # NOTE: This test is also run as part of the pyauto suite. 102 # NOTE: This test is also run as part of the pyauto suite.
103 # See pyauto_nacl/nacl.scons. 103 # See pyauto_nacl/nacl.scons.
104 104
105 env.Publish(ppapi_tests_target, 'run', 105 env.Publish(ppapi_tests_target, 'run',
106 ['$SOURCE_ROOT/ppapi/tests/test_url_loader_data/*'], 106 ['$SOURCE_ROOT/ppapi/tests/test_url_loader_data/*'],
107 subdir='test_url_loader_data') 107 subdir='test_url_loader_data')
108 108
109 env.Publish(ppapi_tests_target, 'run', 109 env.Publish(ppapi_tests_target, 'run',
110 [ppapi_tests_nexe, 110 [ppapi_tests_nexe,
111 '$SOURCE_ROOT/ppapi/tests/test_case.html', 111 '$SOURCE_ROOT/ppapi/tests/test_case.html',
112 'test_case.nmf', 112 'test_case.nmf',
113 '$SOURCE_ROOT/ppapi/tests/test_image_data', 113 '$SOURCE_ROOT/ppapi/tests/test_image_data',
114 '$SOURCE_ROOT/ppapi/tests/test_page.css']) 114 '$SOURCE_ROOT/ppapi/tests/test_page.css'])
OLDNEW
« no previous file with comments | « ppapi/native_client/tests/ppapi_test_example/nacl.scons ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698