Fixes some bugs with memory setup and halt-sled allocation and...

SConstruct

 # -*- python -*-
 # Copyright 2008 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 glob
 import os
 import stat
 import subprocess
@@ skipping 346 matching lines @@
       TEST_SUITES[s] = None
     env.Alias(s, node)
   if node_name:
     env.ComponentTestOutput(node_name, node)
 
 pre_base_env.AddMethod(AddNodeToTestSuite)
 
 # ----------------------------------------------------------
 # Convenient testing aliases
 # NOTE: work around for scons non-determinism in the following two lines
-Alias('small_tests', [])
+Alias('sel_ldr_sled_tests', [])
+
+Alias('small_tests', [ 'sel_ldr_sled_tests' ])
 Alias('medium_tests', [])
 Alias('large_tests', [])
 Alias('browser_tests', [])
 
 Alias('unit_tests', 'small_tests')
 Alias('smoke_tests', ['small_tests', 'medium_tests'])
 
 Alias('memcheck_bot_tests', ['small_tests', 'medium_tests', 'large_tests'])
 Alias('tsan_bot_tests', [])
 
@@ skipping 1196 matching lines @@
   nacl_env['LINKCOM'] += '&& $PYTHON -c "import os; import sys;\
       print(sys.argv[1] + sys.argv[2] + \
             str(os.stat(sys.argv[1])[6]) + sys.argv[3])" \
       $TARGET " is " " bytes"'
 
 environment_list.append(nacl_env)
 
 nacl_env.Append(
     BUILD_SCONSCRIPTS = [
     ####  ALPHABETICALLY SORTED ####
+    'src/trusted/service_runtime/nacl.scons',
     'tests/app_lib/nacl.scons',
     'tests/autoloader/nacl.scons',
     'tests/barebones/nacl.scons',
     'tests/bundle_size/nacl.scons',
     'tests/contest_issues/nacl.scons',
     'tests/data_not_executable/nacl.scons',
     'tests/dynamic_code_loading/nacl.scons',
     'tests/egyptian_cotton/nacl.scons',
     'tests/environment_variables/nacl.scons',
     'tests/fake_browser/nacl.scons',
@@ skipping 547 matching lines @@
 
 # Note: BuildEnvironments calls FilterEnvironments internally.
 # Passing environment_list is OK
 BuildEnvironments(environment_list)
 
 # Change default to build everything, but not run tests.
 Default(['all_programs', 'all_bundles', 'all_test_programs', 'all_libraries'])
 
 # separate warnings from actual build output
 Banner('B U I L D - O U T P U T:')