OLD | NEW |
1 #! -*- python -*- | 1 #! -*- python -*- |
2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. |
3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
5 | 5 |
6 import atexit | 6 import atexit |
7 import json | 7 import json |
8 import os | 8 import os |
9 import platform | 9 import platform |
10 import re | 10 import re |
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
323 | 323 |
324 BitFromArgument(env, 'pnacl_generate_pexe', default=env.Bit('bitcode'), | 324 BitFromArgument(env, 'pnacl_generate_pexe', default=env.Bit('bitcode'), |
325 desc='use pnacl to generate pexes and translate in a separate step') | 325 desc='use pnacl to generate pexes and translate in a separate step') |
326 | 326 |
327 BitFromArgument(env, 'translate_in_build_step', default=True, | 327 BitFromArgument(env, 'translate_in_build_step', default=True, |
328 desc='Run translation during build phase (e.g. if do_not_run_tests=1)') | 328 desc='Run translation during build phase (e.g. if do_not_run_tests=1)') |
329 | 329 |
330 BitFromArgument(env, 'pnacl_unsandboxed', default=False, | 330 BitFromArgument(env, 'pnacl_unsandboxed', default=False, |
331 desc='Translate pexe to an unsandboxed, host executable') | 331 desc='Translate pexe to an unsandboxed, host executable') |
332 | 332 |
| 333 BitFromArgument(env, 'minsfi', default=env.Bit('bitcode'), |
| 334 desc='Build MinSFI libraries and run tests') |
| 335 |
333 BitFromArgument(env, 'nonsfi_nacl', default=False, | 336 BitFromArgument(env, 'nonsfi_nacl', default=False, |
334 desc='Use Non-SFI Mode instead of the original SFI Mode. This uses ' | 337 desc='Use Non-SFI Mode instead of the original SFI Mode. This uses ' |
335 'nonsfi_loader instead of sel_ldr, and it tells the PNaCl toolchain ' | 338 'nonsfi_loader instead of sel_ldr, and it tells the PNaCl toolchain ' |
336 'to translate pexes to Non-SFI nexes.') | 339 'to translate pexes to Non-SFI nexes.') |
337 | 340 |
338 BitFromArgument(env, 'use_newlib_nonsfi_loader', default=True, | 341 BitFromArgument(env, 'use_newlib_nonsfi_loader', default=True, |
339 desc='Test nonsfi_loader linked against NaCl newlib instead of the one ' | 342 desc='Test nonsfi_loader linked against NaCl newlib instead of the one ' |
340 'linked against host libc. This flag makes sense only with ' | 343 'linked against host libc. This flag makes sense only with ' |
341 'nonsfi_nacl=1.') | 344 'nonsfi_nacl=1.') |
342 | 345 |
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
714 # These test suites are essentially shortcuts that run a specific subset of the | 717 # These test suites are essentially shortcuts that run a specific subset of the |
715 # test cases. | 718 # test cases. |
716 ACCEPTABLE_TEST_SUITES = set([ | 719 ACCEPTABLE_TEST_SUITES = set([ |
717 'barebones_tests', | 720 'barebones_tests', |
718 'dynamic_load_tests', | 721 'dynamic_load_tests', |
719 'eh_tests', # Tests for C++ exception handling | 722 'eh_tests', # Tests for C++ exception handling |
720 'exception_tests', # Tests for hardware exception handling | 723 'exception_tests', # Tests for hardware exception handling |
721 'exit_status_tests', | 724 'exit_status_tests', |
722 'gdb_tests', | 725 'gdb_tests', |
723 'mmap_race_tests', | 726 'mmap_race_tests', |
| 727 'minsfi_tests', |
724 'nonpexe_tests', | 728 'nonpexe_tests', |
725 'performance_tests', | 729 'performance_tests', |
726 'pnacl_abi_tests', | 730 'pnacl_abi_tests', |
727 'sel_ldr_sled_tests', | 731 'sel_ldr_sled_tests', |
728 'sel_ldr_tests', | 732 'sel_ldr_tests', |
729 'toolchain_tests', | 733 'toolchain_tests', |
730 'validator_modeling', | 734 'validator_modeling', |
731 'validator_tests', | 735 'validator_tests', |
732 # Special testing of the decoder for the ARM validator. | 736 # Special testing of the decoder for the ARM validator. |
733 'arm_decoder_tests', | 737 'arm_decoder_tests', |
(...skipping 1465 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2199 CFLAGS = ['${EXTRA_CFLAGS}'], | 2203 CFLAGS = ['${EXTRA_CFLAGS}'], |
2200 CXXFLAGS = ['${EXTRA_CXXFLAGS}'], | 2204 CXXFLAGS = ['${EXTRA_CXXFLAGS}'], |
2201 ) | 2205 ) |
2202 if base_env.Bit('ncval_testing'): | 2206 if base_env.Bit('ncval_testing'): |
2203 base_env.Append(CPPDEFINES = ['NCVAL_TESTING']) | 2207 base_env.Append(CPPDEFINES = ['NCVAL_TESTING']) |
2204 | 2208 |
2205 base_env.Append(BUILD_SCONSCRIPTS = [ | 2209 base_env.Append(BUILD_SCONSCRIPTS = [ |
2206 # KEEP THIS SORTED PLEASE | 2210 # KEEP THIS SORTED PLEASE |
2207 'build/package_version/build.scons', | 2211 'build/package_version/build.scons', |
2208 'pynacl/build.scons', | 2212 'pynacl/build.scons', |
| 2213 'src/minsfi/trusted/build.scons', |
2209 'src/nonsfi/irt/build.scons', | 2214 'src/nonsfi/irt/build.scons', |
2210 'src/nonsfi/loader/build.scons', | 2215 'src/nonsfi/loader/build.scons', |
2211 'src/shared/gio/build.scons', | 2216 'src/shared/gio/build.scons', |
2212 'src/shared/imc/build.scons', | 2217 'src/shared/imc/build.scons', |
2213 'src/shared/ldr/build.scons', | 2218 'src/shared/ldr/build.scons', |
2214 'src/shared/platform/build.scons', | 2219 'src/shared/platform/build.scons', |
2215 'src/shared/serialization/build.scons', | 2220 'src/shared/serialization/build.scons', |
2216 'src/shared/srpc/build.scons', | 2221 'src/shared/srpc/build.scons', |
2217 'src/shared/utils/build.scons', | 2222 'src/shared/utils/build.scons', |
2218 'src/third_party/gtest/build.scons', | 2223 'src/third_party/gtest/build.scons', |
(...skipping 1080 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3299 'tests/includability/nacl.scons', | 3304 'tests/includability/nacl.scons', |
3300 'tests/infoleak/nacl.scons', | 3305 'tests/infoleak/nacl.scons', |
3301 'tests/libc/nacl.scons', | 3306 'tests/libc/nacl.scons', |
3302 'tests/libc_free_hello_world/nacl.scons', | 3307 'tests/libc_free_hello_world/nacl.scons', |
3303 'tests/list_mappings/nacl.scons', | 3308 'tests/list_mappings/nacl.scons', |
3304 'tests/longjmp/nacl.scons', | 3309 'tests/longjmp/nacl.scons', |
3305 'tests/loop/nacl.scons', | 3310 'tests/loop/nacl.scons', |
3306 'tests/mandel/nacl.scons', | 3311 'tests/mandel/nacl.scons', |
3307 'tests/math/nacl.scons', | 3312 'tests/math/nacl.scons', |
3308 'tests/memcheck_test/nacl.scons', | 3313 'tests/memcheck_test/nacl.scons', |
| 3314 'tests/minsfi/nacl.scons', |
3309 'tests/mmap/nacl.scons', | 3315 'tests/mmap/nacl.scons', |
3310 'tests/mmap_main_nexe/nacl.scons', | 3316 'tests/mmap_main_nexe/nacl.scons', |
3311 'tests/mmap_prot_exec/nacl.scons', | 3317 'tests/mmap_prot_exec/nacl.scons', |
3312 'tests/mmap_race_protect/nacl.scons', | 3318 'tests/mmap_race_protect/nacl.scons', |
3313 'tests/nacl_log/nacl.scons', | 3319 'tests/nacl_log/nacl.scons', |
3314 'tests/nameservice/nacl.scons', | 3320 'tests/nameservice/nacl.scons', |
3315 'tests/nanosleep/nacl.scons', | 3321 'tests/nanosleep/nacl.scons', |
3316 'tests/nonsfi/nacl.scons', | 3322 'tests/nonsfi/nacl.scons', |
3317 'tests/noop/nacl.scons', | 3323 'tests/noop/nacl.scons', |
3318 'tests/nrd_xfer/nacl.scons', | 3324 'tests/nrd_xfer/nacl.scons', |
(...skipping 685 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4004 nacl_env.ValidateSdk() | 4010 nacl_env.ValidateSdk() |
4005 | 4011 |
4006 if BROKEN_TEST_COUNT > 0: | 4012 if BROKEN_TEST_COUNT > 0: |
4007 msg = "There are %d broken tests." % BROKEN_TEST_COUNT | 4013 msg = "There are %d broken tests." % BROKEN_TEST_COUNT |
4008 if GetOption('brief_comstr'): | 4014 if GetOption('brief_comstr'): |
4009 msg += " Add --verbose to the command line for more information." | 4015 msg += " Add --verbose to the command line for more information." |
4010 print msg | 4016 print msg |
4011 | 4017 |
4012 # separate warnings from actual build output | 4018 # separate warnings from actual build output |
4013 Banner('B U I L D - O U T P U T:') | 4019 Banner('B U I L D - O U T P U T:') |
OLD | NEW |