Get rid of assumptions about ".nexe" extension.

SConstruct

 # -*- 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 atexit
 import glob
 import os
 import platform
 import stat
@@ skipping 1113 matching lines @@
 
   command = [validator] + validator_flags + [image]
   return CommandTest(env, name, command, size, **extra)
 
 pre_base_env.AddMethod(CommandValidatorTestNacl)
 
 
 def ExtractPublishedFiles(env, target_name):
   run_files = ['$STAGING_DIR/' + os.path.basename(published_file.path)
                for published_file in env.GetPublished(target_name, 'run')]
-  nexe = '$STAGING_DIR/' + target_name
+  nexe = '$STAGING_DIR/%s${PROGSUFFIX}' % target_name
   return [env.File(file) for file in run_files + [nexe]]
 
 pre_base_env.AddMethod(ExtractPublishedFiles)
 
 
 # ----------------------------------------------------------
 EXTRA_ENV = ['XAUTHORITY', 'HOME', 'DISPLAY', 'SSH_TTY', 'KRB5CCNAME']
 
 def SetupBrowserEnv(env):
   for var_name in EXTRA_ENV:
@@ skipping 370 matching lines @@
 
   gdb = nacl_extra_sdk_env['GDB']
   command = ([gdb, '-q', '-batch', '-x', input, '--loader', sel_ldr] +
              gdb_flags + command)
 
   return CommandTest(env, name, command, 'large', **extra)
 
 pre_base_env.AddMethod(CommandGdbTestNacl)
 
 
-def SelUniversalTest(env, name, command, sel_universal_flags=None, **kwargs):
+def SelUniversalTest(env, name, nexe, sel_universal_flags=None, **kwargs):
   # The dynamic linker's ability to receive arguments over IPC at
   # startup currently requires it to reject the plugin's first
   # connection, but this interferes with the sel_universal-based
   # testing because sel_universal does not retry the connection.
   # TODO(mseaborn): Fix by retrying the connection or by adding an
   # option to ld.so to disable its argv-over-IPC feature.
   if env.Bit('nacl_glibc') and not env.Bit('nacl_static_link'):
     return []
 
   if sel_universal_flags is None:
     sel_universal_flags = []
 
   # when run under qemu, sel_universal must sneeak in qemu to execv
   # call that spawns sel_ldr.
   if env.Bit('target_arm') and env.UsingEmulator():
     sel_universal_flags.append('--command_prefix')
     sel_universal_flags.append(env['EMULATOR'])
 
   node = CommandSelLdrTestNacl(env,
                                name,
-                               command,
+                               nexe,
                                loader='sel_universal',
                                sel_ldr_flags=sel_universal_flags,
                                **kwargs)
   # sel_universal locates sel_ldr via /proc/self/exe on Linux.
   if not env.Bit('built_elsewhere'):
     env.Depends(node, GetSelLdr(env))
   return node
 
 pre_base_env.AddMethod(SelUniversalTest)
 
@@ skipping 20 matching lines @@
   extra['osenv'] = extra.get('osenv', []) + extra_env
 
 pre_base_env.AddMethod(MakeVerboseExtraOptions)
 
 def ShouldUseVerboseOptions(extra):
   """ Heuristic for setting up Verbose NACLLOG options. """
   return ('process_output' in extra or
           'log_golden' in extra)
 
 # ----------------------------------------------------------
-def CommandSelLdrTestNacl(env, name, command,
+def CommandSelLdrTestNacl(env, name, nexe,
+                          args = None,
                           log_verbosity=2,
                           sel_ldr_flags=None,
                           loader='sel_ldr',
                           size='medium',
                           # True for *.nexe statically linked with glibc
                           glibc_static=False,
                           uses_ppapi=False,
                           **extra):
   # Disable all sel_ldr tests for windows under coverage.
   # Currently several .S files block sel_ldr from being instrumented.
   # See http://code.google.com/p/nativeclient/issues/detail?id=831
   if ('TRUSTED_ENV' in env and
       env['TRUSTED_ENV'].Bit('coverage_enabled') and
       env['TRUSTED_ENV'].Bit('windows')):
     return []
 
+  if args is None:

[Nick Bray, 2011/06/23 18:32:24]

if args is not None:
  command = [nexe] + args

(Watch the spacing around brackets, too.)

[pdox, 2011/06/23 20:42:58]

Done.

+    args = []
+  command = [ nexe ] + args
+
   sel_ldr = GetSelLdr(env, loader);
   if not sel_ldr:
     print 'WARNING: no sel_ldr found. Skipping test %s' % name
     return []
 
   # Avoid problems with [] as default arguments
   if sel_ldr_flags is None:
     sel_ldr_flags = []
 
   # Disable the validator if running a GLibC test under Valgrind.
@@ skipping 1613 matching lines @@
 Default(['all_programs', 'all_bundles', 'all_test_programs', 'all_libraries'])
 
 if BROKEN_TEST_COUNT > 0:
   msg = "There are %d broken tests." % BROKEN_TEST_COUNT
   if GetOption('brief_comstr'):
     msg += " Add --verbose to the command line for more information."
   print msg
 
 # separate warnings from actual build output
 Banner('B U I L D - O U T P U T:')