Get rid of assumptions about ".nexe" extension.

SConstruct

Index: SConstruct
===================================================================
--- SConstruct	(revision 5756)
+++ SConstruct	(working copy)
@@ -1131,7 +1131,7 @@
 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)
@@ -1522,7 +1522,7 @@
 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
@@ -1543,7 +1543,7 @@
 
   node = CommandSelLdrTestNacl(env,
                                name,
-                               command,
+                               nexe,
                                loader='sel_universal',
                                sel_ldr_flags=sel_universal_flags,
                                **kwargs)
@@ -1584,7 +1584,8 @@
           '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',
@@ -1601,6 +1602,10 @@
       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