Separate the (partial) decoder of the x86_32 validator into a separate library.

src/trusted/validator_x86/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 os
 import sys
 Import('env')
 
@@ skipping 293 matching lines @@
                                  ['small_tests', 'validator_tests'])
 
 # ======================================================================
 # Decoder unittests
 if test_env.Bit('target_x86_32'):
   # TODO(kschimpf): remove this when the validator builds as 64-bits.
   if test_env.Bit('build_x86_32'):
     ncdecode_tests = test_env.ComponentProgram(
         'ncdecode_tests',
         ['ncdecode_tests.c'],
-        EXTRA_LIBS=[test_env.NaClTargetArchSuffix('ncval_seg_sfi_verbose'),
+        EXTRA_LIBS=[test_env.NaClTargetArchSuffix('ncdis_seg_sfi_verbose'),
                     ])
 
     node = test_env.CommandTest(
         'ncdecode_tests.out',
         [ncdecode_tests],
         )
 
     test_env.AddNodeToTestSuite(node, ['small_tests'])
 
 # ======================================================================
 ncdis = test_env.ComponentProgram(
   'ncdis', [
     'ncdis.c',
     force_cpp_o,
   ],
   EXTRA_LIBS=[test_env.NaClTargetArchSuffix('ncdis_util'),
-              test_env.NaClTargetArchSuffix('ncval_seg_sfi_verbose'),
+              #test_env.NaClTargetArchSuffix('ncdis_seg_sfi_verbose'),
               test_env.NaClTargetArchSuffix('ncfileutils'),
               'utils',
               ])
 
 env.Requires(ncdis, crt)
 
 # ======================================================================
 # Valiator unittests
 if test_env.Bit('target_x86_32'):
   ncval_tests = test_env.ComponentProgram(
       'ncval_tests',
       ['ncval_tests.c'],
       EXTRA_LIBS=[test_env.NaClTargetArchSuffix('ncdis_util'),
-                  test_env.NaClTargetArchSuffix('ncval_seg_sfi_verbose'),
+                  test_env.NaClTargetArchSuffix('ncval_seg_sfi'),
                   ])
   test_env.Requires(ncval_tests, crt)
 
   node = test_env.CommandTest(
       'ncval_tests.out',
       [ncval_tests],
       )
 
   test_env.AddNodeToTestSuite(node, ['small_tests', 'validator_tests'])
 
@@ skipping 60 matching lines @@
                             NCDIS_ITER_TEST_NAME)
 
 # ======================================================================
 # Segment register validator.
 ncval = test_env.ComponentProgram(
   'ncval', [
     'ncval.c',
     force_cpp_o,
   ],
   EXTRA_LIBS=[test_env.NaClTargetArchSuffix('ncdis_util'),
-              test_env.NaClTargetArchSuffix('ncval_seg_sfi_verbose'),
+              test_env.NaClTargetArchSuffix('ncval_seg_sfi'),
               test_env.NaClTargetArchSuffix('ncfileutils'),
               'utils'
               ])
 
 test_env.SDKInstallTrusted('ncval', ncval)
 
 test_env.Requires(ncval, crt)
 
 # ======================================================================
 # Validator tests against real nacl images
@@ skipping 170 matching lines @@
     ext = 'nval'
     node_val = test_env.CommandTest(
         __OutTestFile(test, base, ext),
         [ncval, '--use_iter=false', '--max_errors=-1', '--hex_text=-'],
         stdin = __BaseTestFile(base, 'hex'),
         stdout_golden = __BaseTestFile(base, ext))
     __AddTest(test, test_env, base, ext, node_val,
               ['small_tests', 'validator_tests'])
 
 __AddNegMaxErrors()