Enable using the toolchain (llvm) provided FileCheck.

tests/toolchain/nacl.scons

Index: tests/toolchain/nacl.scons
diff --git a/tests/toolchain/nacl.scons b/tests/toolchain/nacl.scons
index 9f888229746dfc1764312a676ceba38c1929cd54..96cbfa0f519db9994736bdcaccf2086e5fef537b 100644
--- a/tests/toolchain/nacl.scons
+++ b/tests/toolchain/nacl.scons
@@ -499,6 +499,29 @@ if debug_env.AllowNonStableBitcode():
   debug_env.AddNodeToTestSuite(node,
                                ['small_tests', 'toolchain_tests'],
                                'run_dwarf_local_var_objdump_test')
+  if env.Bit('bitcode') 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',