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

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: 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) 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 # causes object files to end up in the wrong directory. 84 # causes object files to end up in the wrong directory.
85 def MakeComponentObject(src): 85 def MakeComponentObject(src):
86 return env.ComponentObject( 86 return env.ComponentObject(
87 os.path.splitext(src)[0], 87 os.path.splitext(src)[0],
88 os.path.join('$SOURCE_ROOT/ppapi/tests', src)) 88 os.path.join('$SOURCE_ROOT/ppapi/tests', src))
89 89
90 ppapi_tests_objs = [MakeComponentObject(src) for src in ppapi_tests_sources] 90 ppapi_tests_objs = [MakeComponentObject(src) for src in ppapi_tests_sources]
91 91
92 ppapi_tests_nexe = env.ComponentProgram(ppapi_tests_target, 92 ppapi_tests_nexe = env.ComponentProgram(ppapi_tests_target,
93 ppapi_tests_objs, 93 ppapi_tests_objs,
94 EXTRA_LIBS=['${PPAPI_LIBS}', 94 EXTRA_LIBS=['ppapi',
95 'ppapi_cpp' 95 'ppapi_cpp'
96 ]) 96 ])
97 97
98 # Note that the html is required to run this program. 98 # Note that the html is required to run this program.
99 # To run, load page with mode=nacl search string: 99 # To run, load page with mode=nacl search string:
100 # http://localhost:5103/scons-out/nacl-x86-32/staging/test_case.html?mode=nacl 100 # http://localhost:5103/scons-out/nacl-x86-32/staging/test_case.html?mode=nacl
101 # http://localhost:5103/scons-out/nacl-x86-64/staging/test_case.html?mode=nacl 101 # http://localhost:5103/scons-out/nacl-x86-64/staging/test_case.html?mode=nacl
102 102
103 # NOTE: This test is also run as part of the pyauto suite. 103 # NOTE: This test is also run as part of the pyauto suite.
104 # See pyauto_nacl/nacl.scons. 104 # See pyauto_nacl/nacl.scons.
105 105
106 env.Publish(ppapi_tests_target, 'run', 106 env.Publish(ppapi_tests_target, 'run',
107 ['$SOURCE_ROOT/ppapi/tests/test_url_loader_data/*'], 107 ['$SOURCE_ROOT/ppapi/tests/test_url_loader_data/*'],
108 subdir='test_url_loader_data') 108 subdir='test_url_loader_data')
109 109
110 env.Publish(ppapi_tests_target, 'run', 110 env.Publish(ppapi_tests_target, 'run',
111 [ppapi_tests_nexe, 111 [ppapi_tests_nexe,
112 '$SOURCE_ROOT/ppapi/tests/test_case.html', 112 '$SOURCE_ROOT/ppapi/tests/test_case.html',
113 'test_case.nmf', 113 'test_case.nmf',
114 '$SOURCE_ROOT/ppapi/tests/test_image_data', 114 '$SOURCE_ROOT/ppapi/tests/test_image_data',
115 '$SOURCE_ROOT/ppapi/tests/test_page.css']) 115 '$SOURCE_ROOT/ppapi/tests/test_page.css'])
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698