Handle ELFCLASS32 files for x86-64

src/trusted/service_runtime/build.scons

 # -*- python -*-
 # Copyright (c) 2011 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 platform
 import os
 
 Import('env')
 
@@ skipping 635 matching lines @@
 # Do not run when building tools to run on x86-32 but to analyze the
 # arm instruction set
 if not env.CrossToolsBuild():
   node = env.CommandSelLdrTestNacl(
       'fuzz_nullptr_test.out',
       env.File(arch_testdata_dir + '/nullptr.nexe'),
       sel_ldr_flags=['-F'],
       exit_status = '0')
   env.AddNodeToTestSuite(node, ['small_tests'], 'run_fuzz_nullptr_test')
 
+if env.Bit('target_x86_64') and not env.CrossToolsBuild():
+  node = env.CommandSelLdrTestNacl(
+      'hello_x32.out',
+      env.File(os.path.join(arch_testdata_dir, 'hello_x32.nexe')),
+      stdout_golden=env.File(os.path.join('${MAIN_DIR}',
+                                          'tests/hello_world',
+                                          'hello_world.stdout'))
+      )
+  env.AddNodeToTestSuite(node, ['small_tests'], 'run_hello_x32_test')
+
 # ----------------------------------------------------------
 # Integration Tests
 # ----------------------------------------------------------
 
 # Doesn't work on windows under coverage.
 # TODO(bradnelson): fix this to work on windows under coverage.
 # NOTE: uses validator
 if ((not env.Bit('windows') or not env.Bit('coverage_enabled')) and
     not env.CrossToolsBuild()):
   obj_proxy_test_inputs = [ 'fs/obj_proxy_test.c', ]
@@ skipping 177 matching lines @@
     expected_exit_status = 'sigabrt'
   node = env.CommandTest(
       'sel_ldr_thread_death_test.out',
       command=[sel_ldr_thread_death_test_exe],
       exit_status=expected_exit_status)
 
   # TODO(tuduce): Make it work on windows.
   env.AddNodeToTestSuite(node, ['medium_tests'],
                          'run_sel_ldr_thread_death_test',
                          is_broken=env.Bit('windows'))