Index: src/trusted/validator/x86/build.scons |
diff --git a/src/trusted/validator/x86/build.scons b/src/trusted/validator/x86/build.scons |
index 5f678816ece5c43d9dd1c764d36dadf8d16fcd37..781a82ddae7a347fdfe509940c4a5dc367a50b48 100644 |
--- a/src/trusted/validator/x86/build.scons |
+++ b/src/trusted/validator/x86/build.scons |
@@ -20,8 +20,6 @@ lib_env.FilterOut(CCFLAGS=['-Wextra', '-Wswitch-enum', '-Wsign-compare']) |
lib_env.ComponentLibrary(lib_env.NaClTargetArchSuffix('ncval_base'), [ |
'error_reporter.c', |
'halt_trim.c', |
- 'nacl_cpuid.c', |
- 'nacl_xgetbv.S', |
'ncinstbuffer.c', |
'x86_insts.c', |
'nc_segment.c', |
@@ -32,22 +30,6 @@ lib_env.ComponentLibrary(lib_env.NaClTargetArchSuffix('ncval_base_verbose'), [ |
'x86_insts_verbose.c', |
]) |
-# Create environment for command-line tools and testing, rather than |
-# part of the TCB. Then define compile-time flag that communicates |
-# that we are compiling in the test environment (rather than for the TCB). |
-test_env = lib_env.Clone() |
-test_env.Append(CCFLAGS=['-DNACL_TRUSTED_BUT_NOT_TCB']) |
- |
-nacl_cpuid = test_env.ComponentProgram( |
- 'nacl_cpuid', |
- ['nacl_cpuid_test.c'], |
- EXTRA_LIBS=[test_env.NaClTargetArchSuffix('ncval_base')]) |
- |
-node = test_env.CommandTest( |
- 'nacl_cpuid_test.out', |
- [nacl_cpuid]) |
-test_env.AddNodeToTestSuite(node, ['large_tests'], 'run_nacl_cpuid_test') |
- |
#---------- UNIT TESTS --------------------------------- |
# Create an environment to run unit tests using Gtest. |