Add test running support for tests generated as pexes.

SConstruct

 #! -*- python -*-
 # Copyright (c) 2012 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 shutil
@@ skipping 1174 matching lines @@
                              size='medium',
                              **extra):
   validator = GetValidator(env, validator)
   if validator is None:
     print 'WARNING: no validator found. Skipping test %s' % name
     return []
 
   if validator_flags is None:
     validator_flags = []
 
+  if env.Bit('pnacl_stop_with_pexe'):

[robertm, 2012/03/13 21:53:15]

I am not a big fan of the "late kill",
it would be more  intuitive to move the test up into the 
corresponding scons file if it is only a few lines of change there. 

[(google.com) Derek Schuff, 2012/03/13 21:59:27]

Maybe... until someone else tries to add another validator test and then it
breaks or requires them to write more boilerplate in their scons file?

On 2012/03/13 21:53:15, robertm wrote:

+    return []
+
   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/%s${PROGSUFFIX}' % target_name
@@ skipping 738 matching lines @@
 pre_base_env.AddMethod(MakeVerboseExtraOptions)
 
 def ShouldUseVerboseOptions(extra):
   """ Heuristic for setting up Verbose NACLLOG options. """
   return ('process_output_single' in extra or
           'log_golden' in extra)
 
 # ----------------------------------------------------------
 DeclareBit('tests_use_irt', 'Non-browser tests also load the IRT image', False)
 
+# Translate the given pexe. Return the name of the translated nexe and

[Mark Seaborn, 2012/03/13 22:16:55]

Sentence not completed.

+def GetTranslatedNexe(env, pexe):
+  pexe_name = pexe.abspath
+  nexe_name = pexe_name[:pexe_name.index('.pexe')] + '.nexe'
+  trans_flags = []

[Mark Seaborn, 2012/03/13 22:16:55]

trans_flag is not used.

+  trans_cmd = ('${TRANSLATE} ${TRANSLATEFLAGS} -Wl,-L${LIB_DIR} %s -o %s' %
+               (pexe_name, nexe_name))
+
+  pexe_node = env.Command(nexe_name, pexe_name, trans_cmd)
+  return nexe_name, pexe_node

[Mark Seaborn, 2012/03/13 22:16:55]

In the call sites, nexe_name is not used.

+
+pre_base_env.AddMethod(GetTranslatedNexe)
+
 def CommandSelLdrTestNacl(env, name, nexe,
                           args = None,
                           log_verbosity=2,
                           sel_ldr_flags=None,
                           loader=None,
                           size='medium',
                           # True for *.nexe statically linked with glibc
                           glibc_static=False,
                           uses_ppapi=False,
                           skip_bootstrap=False,
                           wrapper_program_prefix=None,
                           # e.g., [ 'python', 'time_check.py', '--' ]
                           **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 []
 
-  command = [nexe]
+  if (env.Bit('pnacl_stop_with_pexe') and env['NACL_BUILD_FAMILY'] != 'TRUSTED'):
+    # The nexe is actually a pexe. translate it before we run it
+    nexe_name, pexe_node = GetTranslatedNexe(env, nexe)
+    command = [nexe_name]
+    extra_deps = [pexe_node]
+  else:
+    command = [nexe]
+    extra_deps = []
+
   if args is not None:
     command += args
 
   if loader is None:
     loader = GetSelLdr(env)
     if loader is None:
       print 'WARNING: no sel_ldr found. Skipping test %s' % name
       return []
 
   # Avoid problems with [] as default arguments
@@ skipping 33 matching lines @@
     loader_cmd = [loader]
   else:
     loader_cmd = [bootstrap, loader, bootstrap_arg]
 
   command = loader_cmd + sel_ldr_flags + ['--'] + command
 
   if ShouldUseVerboseOptions(extra):
     env.MakeVerboseExtraOptions(name, log_verbosity, extra)
 
   node = CommandTest(env, name, command, size, posix_path=True,
-                     wrapper_program_prefix=wrapper_program_prefix, **extra)
+                     wrapper_program_prefix=wrapper_program_prefix,
+                     extra_deps=extra_deps, **extra)
   if env.Bit('tests_use_irt'):
     env.Alias('irt_tests', node)
   return node
 
 pre_base_env.AddMethod(CommandSelLdrTestNacl)
 
 # ----------------------------------------------------------
 TEST_EXTRA_ARGS = ['stdin', 'log_file',
                    'stdout_golden', 'stderr_golden', 'log_golden',
                    'filter_regex', 'filter_inverse', 'filter_group_only',
@@ skipping 1812 matching lines @@
   nacl_env.ValidateSdk()
 
 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:')