Start unit testing for functions in nc_inst_state.c

src/trusted/validator_x86/build.scons

 # -*- python -*-
 # Copyright 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 135 matching lines @@
     ],
     EXTRA_LIBS=['utils',
                 'gio',
                 'platform',
                 'ncopcode_utils'])
 
 env.Requires(ncdecode_tablegen, crt)
 
 # Segment register validator library
 NCVALIDATE_SOURCES = ['nacl_cpuid.c',
-                                    'ncdecode.c',
-                                    'ncinstbuffer.c',
-                                    'nc_segment.c',
-                                    'nc_inst_iter.c',
-                                    'nc_inst_state.c',
-                                    'nc_inst_trans.c',
-                                    'ncop_exps.c',
-                                    'ncvalidate.c',
-                                    'nccopycode.c',
-                                    'nccopycode_stores.S'
-                                    ]
-if env.Bit('target_x86_64'):
-  NCVALIDATE_SOURCES = NCVALIDATE_SOURCES + ncopcode_desc_o
+                      'ncdecode.c',
+                      'ncinstbuffer.c',
+                      'nc_segment.c',
+                      'nc_inst_iter.c',
+                      'nc_inst_state.c',
+                      'nc_inst_trans.c',
+                      'ncop_exps.c',
+                      'ncvalidate.c',
+                      'nccopycode.c',
+                      'nccopycode_stores.S'
+                      ]
+
+NCVALIDATE_SOURCES = NCVALIDATE_SOURCES + ncopcode_desc_o
 
 env.ComponentLibrary('ncvalidate', NCVALIDATE_SOURCES)
 
-# SFI validator library
+# SFI validator library.
+# Note: When loading this library, follow it with ncvalidate, since
+# it contains many routines and constants needed by this library.
 env.ComponentLibrary('ncvalidate_sfi',
                      ['ncvalidate_iter.c',
                       'ncvalidator_registry.c',
                       'nc_opcode_histogram.c',
                       'nc_cpu_checks.c',
                       'nc_illegal.c',
                       'nc_protect_base.c',
                       'nc_memory_protect.c',
                       'ncvalidate_utils.c',
                       'nc_jumps.c'])
@@ skipping 96 matching lines @@
 # ======================================================================
 ncdis = test_env.ComponentProgram(
   'ncdis', [
     'ncdis.c',
     force_cpp,
   ],
   EXTRA_LIBS=[
     'ncdis_util',
     'utils',
     'ncvalidate',
-    'ncopcode_utils',
     'nchelper',
     'ncdis_util',
     'platform',
     'gio'
   ])
 
 env.Requires(ncdis, crt)
 
 # ======================================================================
 # Valiator unittests
@@ skipping 86 matching lines @@
 # Segment register validator.
 ncval = test_env.ComponentProgram(
   'ncval', [
     'ncval.c',
     force_cpp,
   ],
   EXTRA_LIBS=[
     'ncdis_util',
     'ncvalidate_sfi',
     'ncvalidate',
-    'ncopcode_utils',
     'nchelper',
     'platform',
     'gio',
     'utils'
   ])
 
 test_env.Requires(ncval, crt)
 
 # ======================================================================
 # Validator tests against real nacl images
@@ skipping 153 matching lines @@
         stdin = __BaseTestFile(base, 'hex'),
         stdout_golden = __BaseTestFile(base, ext))
     __AddTest(test, test_env, base, ext, node_val,
               ['small_tests', 'validator_tests'])
 
 __AddNegMaxErrors()
 
 #---------- UNIT TESTS ---------------------------------
 
 # Create an environment to run unit tests using Gtest.
-gtest_env = env.Clone();
+gtest_env = test_env.Clone();
 # gtest does not compile with our stringent settings.
 gtest_env.FilterOut(
     CCFLAGS=['-pedantic'],
     CXXFLAGS=['-fno-rtti', '-Weffc++'])
 gtest_env.Prepend(CPPPATH=['${SOURCE_ROOT}/testing/gtest/include'])
 
 # List of (unit) test file prefixes to run unit tests on.
 gtest_sources = ['NCRemainingMemory',
-                 'NCInstBytes']
+                 'NCInstBytes',
+                 'nc_inst_state_']
 
 for source in gtest_sources:
   test_exe = gtest_env.ComponentProgram(
     'x86_validator_tests' + source,
     [source+'Tests.cc'],
-    EXTRA_LIBS=['gtest', 'ncvalidate']);
+    EXTRA_LIBS=['gtest',
+                'ncvalidate',
+                'platform',
+                'gio',
+                ]);
   test_node = gtest_env.CommandTest(
       source+'Tests.out',
       command=[test_exe])
   gtest_env.AddNodeToTestSuite(test_node, ['small_tests'],
                                'run_x86_validator_tests')