validator_ragel: Link into TCB, use under env var

src/trusted/service_runtime/build.scons

Index: src/trusted/service_runtime/build.scons
diff --git a/src/trusted/service_runtime/build.scons b/src/trusted/service_runtime/build.scons
index 1f40e90d3c8986b22c4fbc0859ac9820be81f0b4..b82118709f548ea30df1466e96d35a2328e431bd 100644
--- a/src/trusted/service_runtime/build.scons
+++ b/src/trusted/service_runtime/build.scons
@@ -289,9 +289,12 @@ if env.Bit('windows'):
   )
 
 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')
@@ -316,8 +319,7 @@ sel_ldr_libs = ['sel',
                 '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
@@ -461,8 +463,7 @@ if (not env.CrossToolsBuild() and
                   'imc',
                   'nacl_fault_inject',
                   'platform',
-                  VALIDATOR_LIB,
-                  ] + DEBUG_LIBS)
+                  ] + VALIDATOR_LIBS + DEBUG_LIBS)
   gtest_env.Requires(unit_tests_exe, crt)
 
   node = gtest_env.CommandTest(
@@ -518,8 +519,7 @@ if ((not env.Bit('windows') or not env.Bit('coverage_enabled')) and
                   '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')
@@ -561,8 +561,7 @@ nacl_sync_cond_test_exe = env.ComponentProgram(
                 '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',
@@ -755,6 +754,21 @@ if env.Bit('target_x86_64') and not env.CrossToolsBuild():
       )
   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
 # ----------------------------------------------------------
@@ -783,8 +797,7 @@ if ((not env.Bit('windows') or not env.Bit('coverage_enabled')) and
                   'platform',
                   'nacl_xdr',
                   'container',
-                  VALIDATOR_LIB,
-                  ] + DEBUG_LIBS)
+                  ] + VALIDATOR_LIBS + DEBUG_LIBS)
 
   node = env.CommandTest(
       'obj_proxy_test.out',
@@ -934,8 +947,7 @@ if (not env.CrossToolsBuild() and
                   '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().