Non-SFI Mode: Centralise test whitelists; move to Scons

SConstruct

 #! -*- 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 atexit
 import json
 import os
 import platform
 import re
@@ skipping 641 matching lines @@
     'run_ppapi_geturl_valid_test',
     'run_ppapi_geturl_invalid_test',
     # http://code.google.com/p/chromium/issues/detail?id=108131
     # we would need to list all of the glibc components as
     # web accessible resources in the extensions's manifest.json,
     # not just the nexe and nmf file.
     'run_ppapi_extension_mime_handler_browser_test',
     ])
 nacl_glibc_skiplist.update(['%s_irt' % test for test in nacl_glibc_skiplist])
 
+# Whitelist of tests to run for Non-SFI Mode.  Note that typos here will
+# not be caught automatically!
+# TODO(mseaborn): Eventually we should run all of small_tests instead of
+# this whitelist.
+nonsfi_test_whitelist = set([
+    'run_clock_get_test',
+    'run_dup_test',
+    'run_fcntl_test',
+    'run_float_test',
+    'run_fork_test',
+    'run_getpid_test',
+    'run_hello_world_test',
+    'run_irt_futex_test',
+    'run_malloc_realloc_calloc_free_test',
+    'run_mmap_test',
+    'run_nanosleep_test',
+    'run_prctl_test',
+    'run_printf_test',
+    'run_pwrite_test',
+    'run_sigaction_test',
+    'run_signal_test',
+    'run_socket_test',
+    'run_stack_alignment_test',
+    'run_syscall_test',
+    'run_thread_test',
+    ])
+
 
 # If a test is not in one of these suites, it will probally not be run on a
 # regular basis.  These are the suites that will be run by the try bot or that
 # a large number of users may run by hand.
 MAJOR_TEST_SUITES = set([
   'small_tests',
   'medium_tests',
   'large_tests',
   # Tests using the pepper plugin, only run with chrome
   # TODO(ncbray): migrate pepper_browser_tests to chrome_browser_tests
   'pepper_browser_tests',
   # Lightweight browser tests
   'chrome_browser_tests',
   'huge_tests',
   'memcheck_bot_tests',
   'tsan_bot_tests',
   # Special testing environment for testing comparing x86 validators.
   'ncval_testing',
   # Environment for validator difference testing
   'validator_diff_tests',
+  # Subset of tests enabled for Non-SFI Mode.
+  'nonsfi_tests',
 ])
 
 # These are the test suites we know exist, but aren't run on a regular basis.
 # These test suites are essentially shortcuts that run a specific subset of the
 # test cases.
 ACCEPTABLE_TEST_SUITES = set([
   'barebones_tests',
   'dynamic_load_tests',
   'eh_tests',  # Tests for C++ exception handling
   'exception_tests',  # Tests for hardware exception handling
@@ skipping 148 matching lines @@
     return True
 
   if env.Bit('nacl_glibc') and node_name in nacl_glibc_skiplist:
     return True
 
   return False
 
 pre_base_env.AddMethod(ShouldSkipTest)
 
 
+def AddImplicitTestSuites(suite_list, node_name):
+  if node_name in nonsfi_test_whitelist:
+    suite_list = suite_list + ['nonsfi_tests']
+  return suite_list
+
+
 def AddNodeToTestSuite(env, node, suite_name, node_name, is_broken=False,
                        is_flaky=False):
   global BROKEN_TEST_COUNT
 
   # CommandTest can return an empty list when it silently discards a test
   if not node:
     return
 
   assert node_name is not None
   test_name_regex = r'run_.*_(unit)?test.*$'
   assert re.match(test_name_regex, node_name), (
       'test %r does not match "run_..._test" naming convention '
       '(precise regex is %s)' % (node_name, test_name_regex))
 
+  suite_name = AddImplicitTestSuites(suite_name, node_name)
   ValidateTestSuiteNames(suite_name, node_name)
 
   AlwaysBuild(node)
 
   if is_broken or is_flaky and env.Bit('disable_flaky_tests'):
     # Only print if --verbose is specified
     if not GetOption('brief_comstr'):
       print '*** BROKEN ', node_name
     BROKEN_TEST_COUNT += 1
     env.Alias('broken_tests', node)
@@ skipping 2771 matching lines @@
 nacl_irt_test_env.AddMethod(IrtTestDummyLibrary, 'ComponentLibrary')
 
 def IrtTestAddNodeToTestSuite(env, node, suite_name, node_name=None,
                               is_broken=False, is_flaky=False,
                               disable_irt_suffix=False):
   # The disable_irt_suffix argument is there for allowing tests
   # defined in nacl_irt_test_env to be part of chrome_browser_tests
   # (rather than part of chrome_browser_tests_irt).
   # TODO(mseaborn): But really, all of chrome_browser_tests should be
   # placed in nacl_irt_test_env rather than in nacl_env.
+  suite_name = AddImplicitTestSuites(suite_name, node_name)
   if not disable_irt_suffix:
     if node_name is not None:
       node_name += '_irt'
     suite_name = [name + '_irt' for name in suite_name]
   # NOTE: This needs to be called directly to as we're overriding the
   #       prior version.
   return AddNodeToTestSuite(env, node, suite_name, node_name,
                             is_broken, is_flaky)
 nacl_irt_test_env.AddMethod(IrtTestAddNodeToTestSuite, 'AddNodeToTestSuite')
 
@@ skipping 281 matching lines @@
   nacl_env.ValidateSdk()
 
 if BROKEN_TEST_COUNT > 0:
   msg = "There are %d broken tests." % BROKEN_TEST_COUNT
   if GetOption('brief_comstr'):
     msg += " Add --verbose to the command line for more information."
   print msg
 
 # separate warnings from actual build output
 Banner('B U I L D - O U T P U T:')