Get rid of assumptions about ".nexe" extension.

tests/barebones/nacl.scons

 # -*- python -*-
 # Copyright 2010 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('env')
 
 # Use of "-nostdlib" means these tests produce statically-linked
 # executables.  This does not work with the test runner for
 # nacl-glibc, which always runs the executables via ld.so.  However,
@@ skipping 40 matching lines @@
 
 for basename in barebones_tests:
 
   # c.f. http://code.google.com/p/nativeclient/issues/detail?id=783
   if env.Bit('build_arm') and basename == 'vaarg': continue
 
   # TODO(kcc): the barebones tests confuse the current nacl-ified valgrind.
   if env.IsRunningUnderValgrind(): continue
 
   src = 'barebones_' + basename + '.c'
-  nexe = 'barebones_' + basename + '.nexe'
+  nexe_name = 'barebones_' + basename
   out = 'barebones_' + basename + '.out'
   test = 'run_barebones_' + basename + '_test'
   test = 'run_barebones_' + basename + '_test'
-  env.ComponentProgram(nexe, [FAKE_STARTUP, src])
+  nexe = env.ComponentProgram(nexe_name, [FAKE_STARTUP, src])
 
   # NOTE: we avoid using zero as the "good" exit status and just
   #       arbitrarily picked 55. All tests are coded to follow this model.
-  node = env.CommandSelLdrTestNacl(
-      out,
-      command=[env.File(nexe)],
-      exit_status='55',)
+  node = env.CommandSelLdrTestNacl(out, nexe, exit_status='55')
+
   env.AddNodeToTestSuite(node,
                          ['small_tests', 'sel_ldr_tests', 'barebones_tests'],
                          test,
                          is_broken=is_broken)
 
 
-# a test that the validador can handle an empty segment after the last
+# a test that the validator can handle an empty segment after the last
 # real segment. The gold linker produces files this
 if env.Bit('build_arm') and not env.Bit('bitcode'):
-  nexe = '${SCONSTRUCT_DIR}/tests/prebuilt/arm/gold-barebones_hello_world.nexe'
+  nexe = env.File(
+  '${SCONSTRUCT_DIR}/tests/prebuilt/arm/gold-barebones_hello_world${PROGSUFFIX}'
+  )
   node = env.CommandSelLdrTestNacl(
       'gold-barebones_hello_world.out',
-      command=[env.File(nexe)],
+      nexe,
       exit_status='55',)
   env.AddNodeToTestSuite(node,
                          ['small_tests', 'sel_ldr_tests'],
                          'run_gold-barebones_hello_world_test',
                          is_broken=is_broken)