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')) |