Index: tests/dynamic_code_loading/nacl.scons |
=================================================================== |
--- tests/dynamic_code_loading/nacl.scons (revision 5777) |
+++ tests/dynamic_code_loading/nacl.scons (working copy) |
@@ -41,7 +41,7 @@ |
prog_env.AddBiasForPNaCl() |
prog_env.Append(LINKFLAGS=['--pnacl-allow-native']) |
-dynamic_load_test_nexe_name = ('dynamic_load_test_%s.nexe' % |
+dynamic_load_test_nexe_name = ('dynamic_load_test_%s' % |
env.get('TARGET_FULLARCH')) |
dynamic_load_test_nexe = prog_env.ComponentProgram( |
dynamic_load_test_nexe_name, |
@@ -57,7 +57,7 @@ |
'pthread']) |
env.Publish(dynamic_load_test_nexe_name, 'run', ['dynamic_load_test.nmf']) |
-dynamic_modify_test_nexe_name = ('dynamic_modify_test_%s.nexe' % |
+dynamic_modify_test_nexe_name = ('dynamic_modify_test_%s' % |
env.get('TARGET_FULLARCH')) |
dynamic_modify_test_nexe = prog_env.ComponentProgram( |
dynamic_modify_test_nexe_name, |
@@ -73,26 +73,28 @@ |
'pthread']) |
env.Publish(dynamic_modify_test_nexe_name, 'run', ['dynamic_modify_test.nmf']) |
-prog_env.ComponentProgram('write_to_dyncode.nexe', |
- ['write_to_dyncode.c']) |
+write_to_dyncode_nexe = prog_env.ComponentProgram('write_to_dyncode', |
+ ['write_to_dyncode.c']) |
-prog_env.ComponentProgram('dyncode_disabled_test.nexe', |
- ['dyncode_disabled_test.c'], |
- EXTRA_LIBS=['nacl_dyncode']) |
+dyncode_disabled_test_nexe = prog_env.ComponentProgram( |
+ 'dyncode_disabled_test', |
+ ['dyncode_disabled_test.c'], |
+ EXTRA_LIBS=['nacl_dyncode']) |
-prog_env.ComponentProgram('debug_mode_test.nexe', |
- ['debug_mode_test.c', |
- template_obj], |
- EXTRA_LIBS=['nacl_dyncode']) |
+debug_mode_test_nexe = prog_env.ComponentProgram('debug_mode_test', |
+ ['debug_mode_test.c', |
+ template_obj], |
+ EXTRA_LIBS=['nacl_dyncode']) |
-prog_env.ComponentProgram('dyncode_demand_alloc_test.nexe', |
- ['dyncode_demand_alloc_test.c'], |
- EXTRA_LIBS=['nacl_dyncode']) |
+dyncode_demand_alloc_test_nexe = prog_env.ComponentProgram( |
+ 'dyncode_demand_alloc_test', |
+ ['dyncode_demand_alloc_test.c'], |
+ EXTRA_LIBS=['nacl_dyncode']) |
tests = [ |
prog_env.CommandSelLdrTestNacl( |
'dynamic_load_test.out', |
- command=[dynamic_load_test_nexe], |
+ dynamic_load_test_nexe, |
# We need to set this because the test needs to behave |
# differently in the plugin, but the plugin does not provide a |
# way to distinguish itself. TODO(mseaborn): Fix that. |
@@ -101,26 +103,26 @@ |
), |
prog_env.CommandSelLdrTestNacl( |
'write_to_dyncode.out', |
- command=[prog_env.File('write_to_dyncode.nexe')], |
+ write_to_dyncode_nexe, |
exit_status='untrusted_segfault', |
stdout_golden=prog_env.File('write_to_dyncode.stdout'), |
), |
prog_env.CommandSelLdrTestNacl( |
'dyncode_disabled_test.out', |
- command=[prog_env.File('dyncode_disabled_test.nexe')], |
+ dyncode_disabled_test_nexe, |
osenv='NACL_DISABLE_DYNAMIC_LOADING=1', |
), |
prog_env.CommandSelLdrTestNacl( |
'debug_mode_test.out', |
+ debug_mode_test_nexe, |
# NOTE: the data we are loading does not pass the validator |
sel_ldr_flags=["-c"], |
- command=[prog_env.File('debug_mode_test.nexe')], |
), |
# This tests, from untrusted code, that dyncode pages are |
# inaccessible before they are allocated. |
prog_env.CommandSelLdrTestNacl( |
'dyncode_demand_alloc_test.out', |
- command=[prog_env.File('dyncode_demand_alloc_test.nexe')], |
+ dyncode_demand_alloc_test_nexe, |
exit_status='untrusted_segfault', |
stdout_golden=prog_env.File('dyncode_demand_alloc_test.stdout'), |
), |
@@ -128,7 +130,7 @@ |
if not prog_env.Bit('target_arm'): |
tests.append(prog_env.CommandSelLdrTestNacl( |
'dynamic_modify_test.out', |
- command=[dynamic_modify_test_nexe], |
+ dynamic_modify_test_nexe, |
sel_ldr_flags=['-E', 'NACL_SRPC_STANDALONE=1'])) |
# TODO(kcc): non-standard linking options confuse Valgrind debug info reader. |