MinSFI: Add loader

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 312 matching lines @@
 
   BitFromArgument(env, 'pnacl_generate_pexe', default=env.Bit('bitcode'),
     desc='use pnacl to generate pexes and translate in a separate step')
 
   BitFromArgument(env, 'translate_in_build_step', default=True,
     desc='Run translation during build phase (e.g. if do_not_run_tests=1)')
 
   BitFromArgument(env, 'pnacl_unsandboxed', default=False,
     desc='Translate pexe to an unsandboxed, host executable')
 
+  BitFromArgument(env, 'minsfi', default=env.Bit('bitcode'),
+    desc='Build MinSFI libraries and run tests')
+
   BitFromArgument(env, 'nonsfi_nacl', default=False,
     desc='Use Non-SFI Mode instead of the original SFI Mode.  This uses '
       'nonsfi_loader instead of sel_ldr, and it tells the PNaCl toolchain '
       'to translate pexes to Non-SFI nexes.')
 
   BitFromArgument(env, 'use_newlib_nonsfi_loader', default=True,
     desc='Test nonsfi_loader linked against NaCl newlib instead of the one '
       'linked against host libc. This flag makes sense only with '
       'nonsfi_nacl=1.')
 
@@ skipping 371 matching lines @@
 # 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
   'exit_status_tests',
   'gdb_tests',
   'mmap_race_tests',
+  'minsfi_tests',
   'nonpexe_tests',
   'performance_tests',
   'pnacl_abi_tests',
   'sel_ldr_sled_tests',
   'sel_ldr_tests',
   'toolchain_tests',
   'validator_modeling',
   'validator_tests',
   # Special testing of the decoder for the ARM validator.
   'arm_decoder_tests',
@@ skipping 1465 matching lines @@
     CFLAGS = ['${EXTRA_CFLAGS}'],
     CXXFLAGS = ['${EXTRA_CXXFLAGS}'],
   )
   if base_env.Bit('ncval_testing'):
     base_env.Append(CPPDEFINES = ['NCVAL_TESTING'])
 
   base_env.Append(BUILD_SCONSCRIPTS = [
       # KEEP THIS SORTED PLEASE
       'build/package_version/build.scons',
       'pynacl/build.scons',
+      'src/minsfi/trusted/build.scons',
       'src/nonsfi/irt/build.scons',
       'src/nonsfi/loader/build.scons',
       'src/shared/gio/build.scons',
       'src/shared/imc/build.scons',
       'src/shared/ldr/build.scons',
       'src/shared/platform/build.scons',
       'src/shared/serialization/build.scons',
       'src/shared/srpc/build.scons',
       'src/shared/utils/build.scons',
       'src/third_party/gtest/build.scons',
@@ skipping 1080 matching lines @@
     'tests/includability/nacl.scons',
     'tests/infoleak/nacl.scons',
     'tests/libc/nacl.scons',
     'tests/libc_free_hello_world/nacl.scons',
     'tests/list_mappings/nacl.scons',
     'tests/longjmp/nacl.scons',
     'tests/loop/nacl.scons',
     'tests/mandel/nacl.scons',
     'tests/math/nacl.scons',
     'tests/memcheck_test/nacl.scons',
+    'tests/minsfi/nacl.scons',
     'tests/mmap/nacl.scons',
     'tests/mmap_main_nexe/nacl.scons',
     'tests/mmap_prot_exec/nacl.scons',
     'tests/mmap_race_protect/nacl.scons',
     'tests/nacl_log/nacl.scons',
     'tests/nameservice/nacl.scons',
     'tests/nanosleep/nacl.scons',
     'tests/nonsfi/nacl.scons',
     'tests/noop/nacl.scons',
     'tests/nrd_xfer/nacl.scons',
@@ skipping 685 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:')