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

Side by Side Diff: src/trusted/service_runtime/nacl.scons

Issue 7242011: Get rid of assumptions about ".nexe" extension. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client/
Patch Set: '' Created 9 years, 6 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 2010 The Native Client Authors. All rights reserved. 2 # Copyright 2010 The Native Client Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can 3 # Use of this source code is governed by a BSD-style license that can
4 # be found in the LICENSE file. 4 # be found in the LICENSE file.
5 5
6 6
7 Import('env') 7 Import('env')
8 8
9 # So far, all tests involve native assembler 9 # So far, all tests involve native assembler
10 10
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 ('EXPECTED_BREAK', break_address), 151 ('EXPECTED_BREAK', break_address),
152 ('EXPECTED_RODATA', rodata_address), 152 ('EXPECTED_RODATA', rodata_address),
153 ('EXPECTED_RWDATA', rwdata_address)]: 153 ('EXPECTED_RWDATA', rwdata_address)]:
154 if value is not None: 154 if value is not None:
155 defines += [[symbol, str(value)]] 155 defines += [[symbol, str(value)]]
156 156
157 asm_env = NewAsmEnv(env, defines, rodata_address, rwdata_address) 157 asm_env = NewAsmEnv(env, defines, rodata_address, rwdata_address)
158 158
159 base_name = 'nacl_text_' + variant + '_pad' + name_modifier + '_test' 159 base_name = 'nacl_text_' + variant + '_pad' + name_modifier + '_test'
160 obj = asm_env.ComponentObject(base_name + '.o', nacl_text_pad_asm) 160 obj = asm_env.ComponentObject(base_name + '.o', nacl_text_pad_asm)
161 nexe_name = base_name + '.nexe' 161 nexe_name = base_name
Nick Bray 2011/06/23 18:32:24 Inline.
pdox 2011/06/23 20:42:58 Done.
162 162
163 asm_env.ComponentProgram(nexe_name, [obj]) 163 nexe = asm_env.ComponentProgram(nexe_name, [obj])
164 164
165 node = env.CommandSelLdrTestNacl(base_name + '.out', 165 node = env.CommandSelLdrTestNacl(base_name + '.out',
166 command=[env.File(nexe_name)]) 166 nexe)
167 env.AddNodeToTestSuite(node, 167 env.AddNodeToTestSuite(node,
168 ['small_tests', 'sel_ldr_sled_tests'], 168 ['small_tests', 'sel_ldr_sled_tests'],
169 'run_' + base_name) 169 'run_' + base_name)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698