Get rid of assumptions about ".nexe" extension.

src/trusted/service_runtime/build.scons

 # -*- python -*-
 # Copyright (c) 2011 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import platform
 
 Import('env')
 
 # TODO(robertm): consider adding this to the top level scons files
@@ skipping 593 matching lines @@
                          command=[nacl_tls_unittest])
 
   # Note that this test hangs in pthread_join() on ARM QEMU.
   is_broken = env.Bit('target_arm') and env.UsingEmulator()
   env.AddNodeToTestSuite(node, ['small_tests'], 'run_nacl_tls_unittest',
                          is_broken=is_broken)
 
 # Test that sel_ldr does not crash if the executable file cannot be opened.
 node = env.CommandSelLdrTestNacl(
     'sel_ldr_exe_not_found.out',
-    command=['name_of_file_that_does_not_exist.nexe'],
+    'name_of_file_that_does_not_exist.nexe',
     exit_status='1')
 env.AddNodeToTestSuite(node, ['small_tests'], 'run_sel_ldr_exe_not_found_test')
 
 # ----------------------------------------------------------
 # Small tests with canned binaries
 # ----------------------------------------------------------
 
 # Do not run when building tools to run on x86-32 but to analyze the
 # arm instruction set
 if not env.CrossToolsBuild():
   node = env.CommandSelLdrTestNacl(
       'fuzz_nullptr_test.out',
+      env.File(arch_testdata_dir + '/nullptr.nexe'),
       sel_ldr_flags=['-F'],
-      command = [env.File(arch_testdata_dir + '/nullptr.nexe')],
       exit_status = '0')
   env.AddNodeToTestSuite(node, ['small_tests'], 'run_fuzz_nullptr_test')
 
 # ----------------------------------------------------------
 # Integration Tests
 # ----------------------------------------------------------
 
 # Doesn't work on windows under coverage.
 # TODO(bradnelson): fix this to work on windows under coverage.
 # NOTE: uses validator
@@ skipping 50 matching lines @@
 INTEGRATION_TESTS_X86_STDIN_OUT = ['$SCONSTRUCT_DIR/tests/mandel/test',
                                    '$SCONSTRUCT_DIR/tests/fib/fib_scalar_test',
                                    '$SCONSTRUCT_DIR/tests/fib/fib_array_test' ]
 
 def AddIntegrationTest(test, location):
   if not test or not location:
     return;
 
   node = env.SelUniversalTest(
       test + '_canned.out',
-      command = [env.File(arch_testdata_dir + '/' + test + '.nexe')],
+      env.File(arch_testdata_dir + '/' + test + '.nexe'),
       stdin = location + '.stdin',
       stdout_golden = location + '.stdout',
       )
   env.AddNodeToTestSuite(node,
                          ['medium_tests'],
                          'run_%s_integration_test' % test)
 
 if env.Bit('target_x86'):
   RE_HELLO = '^(Hello, World!)$'
   RE_IDENT = '^\[[0-9,:.]*\] (e_ident\+1 = ELF)$'
 
   node = env.CommandSelLdrTestNacl(
       'nacl_log.out',
-      command = [env.File(arch_testdata_dir + '/hello_world.nexe')],
+      env.File(arch_testdata_dir + '/hello_world.nexe'),
       log_golden = env.File('testdata/hello_world.log'),
       stdout_golden = env.File('testdata/hello_world.stdout'),
       filter_regex = '"' + RE_HELLO + '|' + RE_IDENT + '"',
       filter_group_only = 'true',
       )
   env.AddNodeToTestSuite(node, ['medium_tests'])
 
   assert len(INTEGRATION_TESTS_X86) == len(INTEGRATION_TESTS_X86_STDIN_OUT)
   map(AddIntegrationTest,
       INTEGRATION_TESTS_X86,
@@ skipping 22 matching lines @@
 def AddDeathTest(test, skip):
   if not test:
     return;
 
   if test in skip:
     print 'SKIPPING test ', test
     return;
 
   node = env.CommandSelLdrTestNacl(
       test  + '.out',
-      command = [env.File(arch_testdata_dir + '/' + test + '.nexe')],
+      env.File(arch_testdata_dir + '/' + test + '.nexe'),
       stderr_golden = env.File('testdata/' + test + '.stderr'),
       filter_regex = ERROR_WHILE_LOADING,
       filter_group_only = 'true',
       exit_status = '1')
   env.AddNodeToTestSuite(node, ['medium_tests'])
 
 
 if env.Bit('target_x86'):
   # built in tests/nullptr/
   node = env.CommandSelLdrTestNacl(
       'nullptr.out',
-      command=[env.File(arch_testdata_dir + '/nullptr.nexe')],
+      env.File(arch_testdata_dir + '/nullptr.nexe'),
       exit_status='untrusted_segfault')
   env.AddNodeToTestSuite(node, ['medium_tests'])
 
   if env.Bit('build_x86_32'):
     skip = NOT_AVAIL_X86_32
   else:
     skip = NOT_AVAIL_X86_64
 
   for death_test in DEATH_TESTS_X86:
     AddDeathTest(death_test, skip)
@@ skipping 31 matching lines @@
     expected_exit_status = 'sigabrt'
   node = env.CommandTest(
       'sel_ldr_thread_death_test.out',
       command=[sel_ldr_thread_death_test_exe],
       exit_status=expected_exit_status)
 
   # TODO(tuduce): Make it work on windows.
   env.AddNodeToTestSuite(node, ['medium_tests'],
                          'run_sel_ldr_thread_death_test',
                          is_broken=env.Bit('windows'))