Enable using the toolchain (llvm) provided FileCheck.

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 json
 import os
 import platform
 import re
@@ skipping 687 matching lines @@
     'run_icache_test',
     'run_irt_futex_test',
     'run_malloc_realloc_calloc_free_test',
     'run_mmap_test',
     'run_nanosleep_test',
     'run_nonsfi_syscall_test',
     'run_prctl_test',
     'run_printf_test',
     'run_pwrite_test',
     'run_random_test',
     'run_rlimit_test',

[Mircea Trofin, 2015/03/23 17:27:21]

Unrelated change. Sync-ed my repo, so this shows as a diff from the previous
change in this review.

     'run_sigaction_test',
     'run_signal_sigbus_test',
     'run_signal_test',
     'run_socket_test',
     'run_stack_alignment_asm_test',
     'run_stack_alignment_test',
     'run_syscall_test',
     'run_thread_test',
     ])
 
@@ skipping 899 matching lines @@
   assert len(node) == 1, node
   return node[0]
 
 pre_base_env.AddMethod(GetTranslatedNexe)
 
 
 def CommandTestFileDumpCheck(env,
                              name,
                              target,
                              check_file,
-                             objdump_flags):
+                             objdump_flags,
+                             use_llvm_filecheck=False):
   """Create a test that disassembles a binary (|target|) and checks for
   patterns in the |check_file|.  Disassembly is done using |objdump_flags|.
   """
 
   # Do not try to run OBJDUMP if 'built_elsewhere', since that *might* mean
   # that a toolchain is not even present.  E.g., the arm hw buildbots do
   # not have the pnacl toolchain. We should be able to look for the host
   # ARM objdump though... a TODO(jvoung) for when there is time.
   if env.Bit('built_elsewhere'):
     return []
   target = env.GetTranslatedNexe(target)
   return env.CommandTestFileCheck(name,
                                   ['${OBJDUMP}', objdump_flags, target],
-                                  check_file)
+                                  check_file, use_llvm_filecheck)
 
 pre_base_env.AddMethod(CommandTestFileDumpCheck)
 
-
-def CommandTestFileCheck(env, name, cmd, check_file):
+def CommandTestFileCheck(env, name, cmd, check_file, use_llvm_filecheck=False):
   """Create a test that runs a |cmd| (array of strings),
   which is expected to print to stdout.  The results
   of stdout will then be piped to the file_check.py tool which
   will search for the regexes specified in |check_file|. """
 
-  return env.CommandTest(name,
+  if use_llvm_filecheck:
+    return env.CommandTest(name,
+                         [env.File('${SCONSTRUCT_DIR}/tools/llvm_file_check_wrapper.sh'),
+                         '${FILECHECK}',
+                         check_file] + cmd)

[Derek Schuff, 2015/03/23 17:54:02]

does this work on the ARM bots? you might need direct_emulation=False here.

[Mircea Trofin, 2015/03/24 15:34:41]

Done.

+  else:
+    return env.CommandTest(name,
                          ['${PYTHON}',
-                          env.File('${SCONSTRUCT_DIR}/tools/file_check.py'),
-                          check_file] + cmd,
+                         env.File('${SCONSTRUCT_DIR}/tools/file_check.py'),
+                         check_file] + cmd,
                          # don't run ${PYTHON} under the emulator.
                          direct_emulation=False)
 
 pre_base_env.AddMethod(CommandTestFileCheck)
 
 def CommandSelLdrTestNacl(env, name, nexe,
                           args = None,
                           log_verbosity=2,
                           sel_ldr_flags=None,
                           loader=None,
@@ skipping 2344 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:')