Refactor the process of choosing validators.

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 729 matching lines @@
       )
   env.AddNodeToTestSuite(node, ['small_tests'], 'run_hello_x32_test')
 
 # Test canned hello_world binary with validator_ragel.
 if env.Bit('target_x86'):
   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"',
+      filter_regex = '"^(Hello, World!)$' + '|' +
+        '^[[][^]]*[]] (DANGER! USING THE EXPERIMENTAL DFA VALIDATOR!)$"',
+      filter_group_only = 'true',
       osenv='NACL_DANGEROUS_USE_DFA_VALIDATOR=1',
       )
   env.AddNodeToTestSuite(node, ['medium_tests', 'validator_tests'],
                          'run_dfa_validator_hello_world_test')
 
 if not env.CrossToolsBuild():
   node = env.CommandSelLdrTestNacl(
       'unaligned_data.out',
       env.File(os.path.join(arch_testdata_dir, 'unaligned_data.nexe')))
   env.AddNodeToTestSuite(node, ['small_tests'], 'run_unaligned_data_test')
@@ skipping 197 matching lines @@
 node = env.CommandTest(
   'nacl_error_log_test.out',
   command=[exe],
   exit_status=expected_exit,
   filter_regex='"(NaClCrashLogWriter.*)|(This is a test of the emergency.*)"',
   filter_group_only='true',
   stdout_golden=env.File('nacl_error_log_test.stdout'))
 
 env.AddNodeToTestSuite(node, ['small_tests'],
                        'run_nacl_error_log_test')