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

Unified Diff: tests/stubout_mode/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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tests/startup_message/nacl.scons ('k') | tests/sysbasic/nacl.scons » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/stubout_mode/nacl.scons
===================================================================
--- tests/stubout_mode/nacl.scons (revision 5777)
+++ tests/stubout_mode/nacl.scons (working copy)
@@ -20,12 +20,12 @@
stubout_tool = env['TRUSTED_ENV'].File(
'${STAGING_DIR}/${PROGPREFIX}ncval_stubout${PROGSUFFIX}')
-env.ComponentProgram('partly_invalid.nexe', 'partly_invalid.c')
+partly_invalid_nexe = env.ComponentProgram('partly_invalid', 'partly_invalid.c')
+partly_invalid_stubout_nexe = env.File('partly_invalid_stubout${PROGSUFFIX}')
node = env.Command(
- target='partly_invalid_stubout.nexe',
- source=[stubout_tool,
- env.File('partly_invalid.nexe')],
+ target=partly_invalid_stubout_nexe,
+ source=[stubout_tool, partly_invalid_nexe],
action=[Action('${SOURCES[0]} ${SOURCES[1]} -o $TARGET')])
# This alias is to ensure this test works with built_elsewhere=1,
# because with that option CommandSelLdrTestNacl() assumes all its
@@ -37,18 +37,18 @@
# Without any debug flags, the executable fails validation.
nodes.append(env.CommandSelLdrTestNacl(
- 'partly_invalid_1.out', command=[env.File('partly_invalid.nexe')],
+ 'partly_invalid_1.out', partly_invalid_nexe,
exit_status='1'))
# With "-c", the executable runs to completion but is not safe.
nodes.append(env.CommandSelLdrTestNacl(
- 'partly_invalid_2.out', command=[env.File('partly_invalid.nexe')],
+ 'partly_invalid_2.out', partly_invalid_nexe,
stdout_golden=env.File('without_stubout.stdout'),
sel_ldr_flags=['-c']))
# With "-s", the executable runs part way but then faults.
nodes.append(env.CommandSelLdrTestNacl(
- 'partly_invalid_3.out', command=[env.File('partly_invalid.nexe')],
+ 'partly_invalid_3.out', partly_invalid_nexe,
stdout_golden=env.File('with_stubout.stdout'),
sel_ldr_flags=['-s'],
exit_status='untrusted_sigill'))
@@ -57,7 +57,7 @@
# offline should be equivalent to using sel_ldr's "-s" option.
nodes.append(env.CommandSelLdrTestNacl(
'partly_invalid_stubout.out',
- command=[env.File('partly_invalid_stubout.nexe')],
+ partly_invalid_stubout_nexe,
stdout_golden=env.File('with_stubout.stdout'),
exit_status='untrusted_sigill'))
« no previous file with comments | « tests/startup_message/nacl.scons ('k') | tests/sysbasic/nacl.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698