stop building/testing old x86 validator.

SConstruct

 #! -*- python -*-
 # Copyright (c) 2012 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 atexit
 import json
 import os
 import platform
 import re
@@ skipping 349 matching lines @@
 
   BitFromArgument(env, 'do_not_run_tests', default=False,
     desc='Prevents tests from running.  This lets SCons build the files needed '
       'to run the specified test(s) without actually running them.  This '
       'argument is a counterpart to built_elsewhere.')
 
   BitFromArgument(env, 'no_gdb_tests', default=False,
     desc='Prevents GDB tests from running.  If GDB is not available, you can '
       'test everything else by specifying this flag.')
 
-  BitFromArgument(env, 'validator_ragel', default=True,
-    desc='Use the R-DFA validator instead of the original validators.')
-
   # TODO(shcherbina): add support for other golden-based tests, not only
   # run_x86_*_validator_testdata_tests.
   BitFromArgument(env, 'regenerate_golden', default=False,
     desc='When running golden-based tests, instead of comparing results '
          'save actual output as golden data.')
 
   BitFromArgument(env, 'x86_64_zero_based_sandbox', default=False,
     desc='Use the zero-address-based x86-64 sandbox model instead of '
       'the r15-based model.')
 
@@ skipping 802 matching lines @@
   return bool(env.GetEmulator())
 
 pre_base_env.AddMethod(UsingEmulator)
 
 
 def GetValidator(env, validator):
   # NOTE: that the variable TRUSTED_ENV is set by ExportSpecialFamilyVars()
   if 'TRUSTED_ENV' not in env:
     return None
 
+  # TODO(shyamsundarr): consider renaming ncval_new to ncval.

[Mark Seaborn, 2014/10/07 21:53:46]

Nit: "consider renaming" -> "rename" :-)

[shyamsundarr, 2014/10/08 19:59:03]

Done.

   if validator is None:
     if env.Bit('build_arm'):
       validator = 'arm-ncval-core'
     elif env.Bit('build_mips32'):
       validator = 'mips-ncval-core'
     else:
-      if env.Bit('validator_ragel'):
-        validator = 'ncval_new'
-      else:
-        validator = 'ncval'
+      validator = 'ncval_new'
 
   trusted_env = env['TRUSTED_ENV']
   return trusted_env.File('${STAGING_DIR}/${PROGPREFIX}%s${PROGSUFFIX}' %
                     validator)
 
 pre_base_env.AddMethod(GetValidator)
 
 
 # Perform os.path.abspath rooted at the directory SConstruct resides in.
 def SConstructAbsPath(env, path):
@@ skipping 1005 matching lines @@
       'src/nonsfi/irt/build.scons',
       'src/nonsfi/loader/build.scons',
       'src/shared/gio/build.scons',
       'src/shared/imc/build.scons',
       'src/shared/ldr/build.scons',
       'src/shared/platform/build.scons',
       'src/shared/serialization/build.scons',
       'src/shared/srpc/build.scons',
       'src/shared/utils/build.scons',
       'src/third_party/gtest/build.scons',
-      'src/tools/validator_tools/build.scons',
       'src/trusted/cpu_features/build.scons',
       'src/trusted/debug_stub/build.scons',
       'src/trusted/desc/build.scons',
       'src/trusted/desc_cacheability/build.scons',
       'src/trusted/fault_injection/build.scons',
       'src/trusted/interval_multiset/build.scons',
       'src/trusted/manifest_name_service_proxy/build.scons',
       'src/trusted/nacl_base/build.scons',
       'src/trusted/nonnacl_util/build.scons',
       'src/trusted/perf_counter/build.scons',
       'src/trusted/platform_qualify/build.scons',
       'src/trusted/reverse_service/build.scons',
       'src/trusted/seccomp_bpf/build.scons',
       'src/trusted/sel_universal/build.scons',
       'src/trusted/service_runtime/build.scons',
       'src/trusted/simple_service/build.scons',
       'src/trusted/threading/build.scons',
       'src/trusted/validator/build.scons',
       'src/trusted/validator/driver/build.scons',
-      'src/trusted/validator/x86/32/build.scons',
-      'src/trusted/validator/x86/64/build.scons',
-      'src/trusted/validator/x86/build.scons',
-      'src/trusted/validator/x86/decoder/build.scons',
-      'src/trusted/validator/x86/decoder/generator/build.scons',
-      'src/trusted/validator/x86/ncval_reg_sfi/build.scons',
-      'src/trusted/validator/x86/ncval_seg_sfi/build.scons',
-      'src/trusted/validator/x86/ncval_seg_sfi/generator/build.scons',
-      'src/trusted/validator/x86/testing/enuminsts/build.scons',
       'src/trusted/validator_arm/build.scons',
       'src/trusted/validator_ragel/build.scons',
       'src/trusted/validator_x86/build.scons',
       'src/trusted/weak_ref/build.scons',
       'tests/common/build.scons',
       'tests/lock_manager/build.scons',
       'tests/performance/build.scons',
       'tests/python_version/build.scons',
       'tests/sel_ldr_seccomp/build.scons',
       'tests/srpc_message/build.scons',
@@ skipping 1761 matching lines @@
   nacl_env.ValidateSdk()
 
 if BROKEN_TEST_COUNT > 0:
   msg = "There are %d broken tests." % BROKEN_TEST_COUNT
   if GetOption('brief_comstr'):
     msg += " Add --verbose to the command line for more information."
   print msg
 
 # separate warnings from actual build output
 Banner('B U I L D - O U T P U T:')