Index: src/trusted/validator/x86/testing/enuminsts/build.scons |
diff --git a/src/trusted/validator/x86/testing/enuminsts/build.scons b/src/trusted/validator/x86/testing/enuminsts/build.scons |
index 00d3bc3c8a4ea81b78f50ed013e0249924b837f8..7bcee431cc5793d367434b8c8535f3485db67ea7 100644 |
--- a/src/trusted/validator/x86/testing/enuminsts/build.scons |
+++ b/src/trusted/validator/x86/testing/enuminsts/build.scons |
@@ -27,7 +27,7 @@ if env.AllBits('windows', 'debug'): |
# 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 = env.Clone() |
-test_env.Append(CCFLAGS=['-DNACL_TRUSTED_BUT_NOT_TCB', '-DNACL_RAGEL_DECODER']) |
+test_env.Append(CPPDEFINES=['NACL_TRUSTED_BUT_NOT_TCB', 'NACL_RAGEL_DECODER']) |
vdiff = test_env.ComponentProgram( |
'vdiff', |
@@ -48,5 +48,17 @@ vdiff = test_env.ComponentProgram( |
env.NaClTargetArchSuffix('dfa_validate_caller'), |
'platform', 'gio', 'utils', |
]) |
- |
env.Requires(vdiff, crt) |
+ |
+if env.Bit('target_x86_64'): |
+ node = env.CommandTest( |
+ 'vdiff.out', command=[vdiff, '--easydiff'], |
+ stdout_golden=test_env.File('vdiff_x86_64_baseline.out'), |
+ time_warning=800, time_error=2000) |
+ env.AddNodeToTestSuite(node, ['validator_diff_tests'], 'vdiff_test') |
+ |
+if env.Bit('target_x86_32'): |
+ # No golden output for 32-bit until more diffs are fixed |
+ node = env.CommandTest('vdiff.out', command=[vdiff], |
+ time_warning=800, time_error=2000) |
+ env.AddNodeToTestSuite(node, ['validator_diff_tests'], 'vdiff_test') |