Index: SConstruct |
diff --git a/SConstruct b/SConstruct |
index ab58f1dc8d671ad7ecb68a45e5e27d196a24ff34..e15876df25ee1bad58e873c55996b074d749a397 100755 |
--- a/SConstruct |
+++ b/SConstruct |
@@ -330,6 +330,9 @@ def SetUpArgumentBits(env): |
BitFromArgument(env, 'pnacl_unsandboxed', default=False, |
desc='Translate pexe to an unsandboxed, host executable') |
+ BitFromArgument(env, 'minsfi', default=env.Bit('bitcode'), |
+ desc='Run MinSFI 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 ' |
@@ -2206,6 +2209,7 @@ def MakeBaseTrustedEnv(platform=None): |
# 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', |
@@ -3302,6 +3306,7 @@ irt_variant_tests = [ |
'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', |