validator_ragel: Link into TCB, use under env var

src/trusted/service_runtime/build.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 platform
 import os
 
 Import('env')
 
@@ skipping 271 matching lines @@
           'advapi32',
           'winmm',
 # TODO(gregoryd): ntdll.lib is required for sem_get_value implementation but
 # it is available in Windows DDK only. The DDK is not
 # in third_party, but we might need to add it if we want to use it.
 #          'ntdll',
       ],
   )
 
 if env.Bit('target_x86'):
-  VALIDATOR_LIB = env.NaClTargetArchSuffix('ncvalidate')
+  VALIDATOR_LIBS = [env.NaClTargetArchSuffix('ncvalidate'),
+                    env.NaClTargetArchSuffix('dfa_validate_caller'),
+                    env.NaClTargetArchSuffix('dfa_validate'),
+                    ]
 elif env.Bit('target_arm'):
-  VALIDATOR_LIB = 'ncvalidate_arm_v2'
+  VALIDATOR_LIBS = ['ncvalidate_arm_v2']
 else:
   # Unknown architecture
   raise AssertionError('Unknown architecture')
 
 r_debug_objs = []
 if env.Bit('linux'):
   r_debug_objs += [env.ComponentObject('linux/r_debug.c')]
 
 sel_ldr_libs = ['sel',
                 'env_cleanser',
                 'nacl_error_code',
                 'manifest_proxy',
                 'simple_service',
                 'thread_interface',
                 'gio_wrapped_desc',
                 'nonnacl_srpc',
                 'nrd_xfer',
                 'nacl_perf_counter',
                 'nacl_base',
                 'imc',
                 'container',
                 'nacl_fault_inject',
                 'platform',
                 'platform_qual_lib',
-                VALIDATOR_LIB,
-                ] + DEBUG_LIBS
+                ] + VALIDATOR_LIBS + DEBUG_LIBS
 if ((not env.Bit('coverage_enabled') or not env.Bit('windows')) and
     not env.CrossToolsBuild()):
   sel_main_objs = [env.ComponentObject('sel_main.c')] + r_debug_objs
   SEL_LDR_NODE = env.ComponentProgram('sel_ldr', sel_main_objs,
                                       EXTRA_LIBS=sel_ldr_libs)
   if env.Bit('mac'):
     # This target exists only to check that the service_runtime code
     # can successfully be linked into a Mac OS X dynamic library.  Our
     # assembly code needs to be PIC-friendly and linkable in this
     # context, because it is linked into a dynamic library inside
@@ skipping 123 matching lines @@
                   'simple_service',
                   'thread_interface',
                   'gio_wrapped_desc',
                   'nonnacl_srpc',
                   'nrd_xfer',
                   'nacl_perf_counter',
                   'nacl_base',
                   'imc',
                   'nacl_fault_inject',
                   'platform',
-                  VALIDATOR_LIB,
-                  ] + DEBUG_LIBS)
+                  ] + VALIDATOR_LIBS + DEBUG_LIBS)
   gtest_env.Requires(unit_tests_exe, crt)
 
   node = gtest_env.CommandTest(
       'gtest_output.xml.out',
       command=[unit_tests_exe, '--gtest_output=xml:${TARGET}'])
   gtest_env.AddNodeToTestSuite(node, ['small_tests'],
       'run_service_runtime_tests')
 
 
 if not env.Bit('coverage_enabled') or not env.Bit('windows'):
@@ skipping 35 matching lines @@
                   'simple_service',
                   'thread_interface',
                   'gio_wrapped_desc',
                   'nonnacl_srpc',
                   'nrd_xfer',
                   'nacl_perf_counter',
                   'nacl_base',
                   'imc',
                   'nacl_fault_inject',
                   'platform',
-                  VALIDATOR_LIB,
-                  ] + DEBUG_LIBS)
+                  ] + VALIDATOR_LIBS + DEBUG_LIBS)
   env.Requires(mmap_test_exe, crt)
 
   mmap_test_file = env.File(arch_testdata_dir + '/hello_world.nexe')
   bootstrap, bootstrap_arg = env.GetBootstrap()
   if bootstrap is None:
     mmap_test_command = [mmap_test_exe, mmap_test_file]
   else:
     mmap_test_command = [bootstrap, mmap_test_exe,
                          bootstrap_arg, mmap_test_file]
 
@@ skipping 21 matching lines @@
                 'simple_service',
                 'thread_interface',
                 'gio_wrapped_desc',
                 'nonnacl_srpc',
                 'nrd_xfer',
                 'nacl_perf_counter',
                 'nacl_base',
                 'imc',
                 'nacl_fault_inject',
                 'platform',
-                VALIDATOR_LIB,
-                ] + DEBUG_LIBS)
+                ] + VALIDATOR_LIBS + DEBUG_LIBS)
 env.Requires(nacl_sync_cond_test_exe, crt)
 node = env.CommandTest(
     'nacl_sync_cond_test.out',
     command=[nacl_sync_cond_test_exe])
 env.AddNodeToTestSuite(node,
                        ['medium_tests'],
                        'run_nacl_sync_cond_test',
                        is_broken=is_broken)
 
 
@@ skipping 172 matching lines @@
 if env.Bit('target_x86_64') and not env.CrossToolsBuild():
   node = env.CommandSelLdrTestNacl(
       'hello_x32.out',
       env.File(os.path.join(arch_testdata_dir, 'hello_x32.nexe')),
       stdout_golden=env.File(os.path.join('${MAIN_DIR}',
                                           'tests/hello_world',
                                           'hello_world.stdout'))
       )
   env.AddNodeToTestSuite(node, ['small_tests'], 'run_hello_x32_test')
 
+# Test canned hello_world binary with validator_ragel.
+# TODO(pasko): enable on x86-32 when the validator is updated to accept the
+# binary.
+if env.Bit('target_x86_64'):
+  node = env.CommandSelLdrTestNacl(
+      'dfa_hwd.out',
+      env.File(arch_testdata_dir + '/hello_world.nexe'),
+      stdout_golden = env.File('testdata/hello_world.stdout'),
+      stderr_golden = env.File('testdata/dfa_validator_hello.stderr'),
+      filter_regex = '"^(Hello, World!)$|DANGER"',
+      osenv='NACL_DANGEROUS_USE_DFA_VALIDATOR=1',
+      )
+  env.AddNodeToTestSuite(node, ['medium_tests'],

[Nick Bray, 2012/04/19 23:11:08]

Also add to suite validator_tests ?

[pasko-google - do not use, 2012/04/20 14:30:38]

Yeah, why not. Done.

+                         'run_dfa_validator_hello_world_test')
+
 # ----------------------------------------------------------
 # Integration Tests
 # ----------------------------------------------------------
 
 # Doesn't work on windows under coverage.
 # TODO(bradnelson): fix this to work on windows under coverage.
 # NOTE: uses validator
 if ((not env.Bit('windows') or not env.Bit('coverage_enabled')) and
     not env.CrossToolsBuild()):
   obj_proxy_test_inputs = [ 'fs/obj_proxy_test.c', ]
   obj_proxy_test = env.ComponentProgram(
       'obj_proxy_test',
       obj_proxy_test_inputs,
       EXTRA_LIBS=['sel',
                   'env_cleanser',
                   'manifest_proxy',
                   'simple_service',
                   'thread_interface',
                   'gio_wrapped_desc',
                   'nonnacl_srpc',
                   'nrd_xfer',
                   'nacl_perf_counter',
                   'nacl_base',
                   'imc',
                   'nacl_fault_inject',
                   'platform',
                   'nacl_xdr',
                   'container',
-                  VALIDATOR_LIB,
-                  ] + DEBUG_LIBS)
+                  ] + VALIDATOR_LIBS + DEBUG_LIBS)
 
   node = env.CommandTest(
       'obj_proxy_test.out',
       # NOTE: this is run out of obj/ rather than staging/
       [obj_proxy_test, '-n', '2048'],
       size='huge')
   # TODO(bsy): change this test to use less time -- most of it (on windows)
   # is in the RNG, so with this will inherently speed up when the RNG is
   # updated.
 
@@ skipping 129 matching lines @@
                   'simple_service',
                   'thread_interface',
                   'gio_wrapped_desc',
                   'nonnacl_srpc',
                   'nrd_xfer',
                   'nacl_perf_counter',
                   'nacl_base',
                   'imc',
                   'nacl_fault_inject',
                   'platform',
-                  VALIDATOR_LIB,
-                  ] + DEBUG_LIBS)
+                  ] + VALIDATOR_LIBS + DEBUG_LIBS)
 
   # NaClAbort() behaves differently when code coverage is enabled: it
   # calls exit() rather than abort().
   if env.Bit('coverage_enabled'):
     expected_exit_status = 'naclabort_coverage'
   else:
     expected_exit_status = 'sigabrt'
   node = env.CommandTest(
       'sel_ldr_thread_death_test.out',
       command=[sel_ldr_thread_death_test_exe],
       exit_status=expected_exit_status)
 
   # TODO(tuduce): Make it work on windows.
   env.AddNodeToTestSuite(node, ['medium_tests'],
                          'run_sel_ldr_thread_death_test',
                          is_broken=env.Bit('windows'))
 
 
 # This currently tests linking of sel_main_chrome.c *only*.  We do not
 # expect this program to do anything meaningful when run.
 env.ComponentProgram('sel_main_chrome_test', ['sel_main_chrome_test.c'],
                      EXTRA_LIBS=sel_ldr_libs)