Start unit testing for functions in nc_inst_state.c

src/trusted/service_runtime/build.scons

 # -*- python -*-
 # Copyright 2009 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('env')
 
 # TODO(robertm): consider adding this to the top level scons files
@@ skipping 231 matching lines @@
 #          'ntdll',
       ],
   )
 
 VALIDATOR_LIBS = []
 if ((not env.Bit('coverage_enabled') or not env.Bit('windows')) and
     not env.CrossToolsBuild()):
 
 
   if env.Bit('target_x86'):
-    VALIDATOR_LIBS += ['ncopcode_utils', 'ncvalidate']
     if env.Bit('target_x86_64'):
       VALIDATOR_LIBS += ['ncvalidate_sfi']
+    VALIDATOR_LIBS += ['ncvalidate']
   elif env.Bit('target_arm'):
     VALIDATOR_LIBS += ['ncvalidate_arm_v2', 'arm_validator_core']
 
   # TODO(ncbray) why do we need to link against Cocoa?
   # run_fake_browser_ppapi_test fails on mac, otherwise.
   # http://code.google.com/p/nativeclient/issues/detail?id=1242
   sel_ldr_env = env.Clone()
   if env.Bit('mac'):
     sel_ldr_env.Append(FRAMEWORKS=['Cocoa'])
 
@@ skipping 470 matching lines @@
 
   node = env.CommandTest(
       'sel_ldr_thread_death_test.out',
       command=[sel_ldr_thread_death_test_exe],
       exit_status='segfault')
 
   # TODO(tuduce): Make it work on windows.
   env.AddNodeToTestSuite(node, ['medium_tests'],
                          'run_sel_ldr_thread_death_test',
                          is_broken=env.Bit('windows'))