Enable using the toolchain (llvm) provided FileCheck.

tests/toolchain/nacl.scons

 # -*- 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('env')
 
 # force inclusion of entire library, so that we can validate it
 # NOTE: This approach does not work for -lc because of tons of
 #       undefined symbols which would have to be stubbed out
@@ skipping 481 matching lines @@
   debug_env.AddNodeToTestSuite(node,
                                ['toolchain_tests', 'small_tests'],
                                'run_dwarf_local_var_run_test')
   node = debug_env.CommandTestFileDumpCheck('dwarf_local_var_objdump.out',
                                             dwarf_local_var_nexe,
                                             debug_env.File('dwarf_local_var.c'),
                                             '-W')
   debug_env.AddNodeToTestSuite(node,
                                ['small_tests', 'toolchain_tests'],
                                'run_dwarf_local_var_objdump_test')
+  if env.Bit('bitcode'):

[Derek Schuff, 2015/03/24 16:57:13]

add or env.Bit('nacl_clang')

+    dwarf_method_ptr_nexe = debug_env.ComponentProgram(
+        'dwarf_method_ptr',
+        ['dwarf_method_ptr.cc'],
+        EXTRA_LIBS=['${NONIRT_LIBS}'])
+
+    # Sanity-check -- make sure it runs.
+    node = debug_env.CommandSelLdrTestNacl('dwarf_method_ptr_run.out',
+                                           dwarf_method_ptr_nexe,
+                                           exit_status=42)
+    debug_env.AddNodeToTestSuite(node,
+                                 ['toolchain_tests', 'small_tests'],
+                                 'run_dwarf_method_ptr_run_test')
+
+    file = debug_env.File('dwarf_method_ptr.cc')
+    node = debug_env.CommandTestFileDumpCheck('dwarf_method_ptr_objdump.out',
+                                              dwarf_method_ptr_nexe,
+                                              file,
+                                              '-W',
+                                              use_llvm_filecheck=True)
+    debug_env.AddNodeToTestSuite(node,
+                                 ['small_tests', 'toolchain_tests'],
+                                 'run_dwarf_method_ptr_objdump_test')
 
 if env.Bit('nacl_glibc'):
   nexe = env.ComponentProgram('byteswap64', 'byteswap64.c',
                               EXTRA_LIBS=['${NONIRT_LIBS}'])
   node = env.CommandSelLdrTestNacl('byteswap64.out', nexe)
   env.AddNodeToTestSuite(node,
                          ['toolchain_tests', 'small_tests'],
                          'run_byteswap64_test')
 
 if ((env.Bit('nacl_glibc') or not env.Bit('bitcode'))
@@ skipping 132 matching lines @@
   mixedlink_env.Append(CCFLAGS=['-Wt,-force-align-stack'])
   nexe = mixedlink_env.ComponentProgram(
       'stackalign_test',
       ['call_with_misaligned_stack.S', 'stackalign_test.c'],
       EXTRA_LIBS=['${NONIRT_LIBS}'])
   node = mixedlink_env.CommandSelLdrTestNacl('stackalign.out', nexe)
   mixedlink_env.AddNodeToTestSuite(
       node,
       ['nonpexe_tests', 'small_tests', 'toolchain_tests'],
       'run_stackalign_test')