validator_ragel: Link into TCB, use under env var

tests/multiple_sandboxes/nacl.scons

 # -*- python -*-
 # Copyright 2011 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')
 
 # This test case tests an experimental use case for NaCl.  If you make
 # a change which breaks this test which is difficult to fix, you can
 # disable the test, but please CC mseaborn,krasin.
 
 if 'TRUSTED_ENV' not in env:
   Return()
 trusted_env = env['TRUSTED_ENV']
 
 # This duplicates the library list in src/trusted/service_runtime/build.scons.
 # We would not have to do this if we could get Scons to track dependencies
 # between libraries.
 VALIDATOR_LIBS = []
 if trusted_env.Bit('target_x86'):
-  VALIDATOR_LIBS += [trusted_env.NaClTargetArchSuffix('ncvalidate_verbose')]
+  VALIDATOR_LIBS += [trusted_env.NaClTargetArchSuffix('ncvalidate_verbose'),
+                     trusted_env.NaClTargetArchSuffix('dfa_validate_caller'),
+                     trusted_env.NaClTargetArchSuffix('dfa_validate'),
+                     ]
 elif trusted_env.Bit('target_arm'):
   VALIDATOR_LIBS += ['ncvalidate_arm_v2']
 
 runner = trusted_env.ComponentProgram(
     'multidomain_test_host', ['multidomain_test_host.c'],
     EXTRA_LIBS=['sel',
                 'sel_debug_dummy',
                 'manifest_proxy',
                 'simple_service',
                 'thread_interface',
@@ skipping 32 matching lines @@
 #  * multidomain_test_host assumes it is given a statically linked
 #    executable.  Furthermore, statically-linked nacl-glibc does not
 #    work here because of validation failures which require stubout
 #    mode.
 is_broken = (env.Bit('build_arm')
              or env.Bit('host_mac')
              or env.Bit('nacl_glibc'))
 
 env.AddNodeToTestSuite(node, ['small_tests'], 'run_multidomain_test',
                        is_broken=is_broken)