stop building/testing old x86 validator.

buildbot/buildbot_standard.py

 #!/usr/bin/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.
 
 # Enable 'with' statements in Python 2.5
 from __future__ import with_statement
 
 import os.path
 import re
@@ skipping 174 matching lines @@
               cmd=[gn_path, '--dotfile=../native_client/.gn',
                    '--root=..', 'gen', '../out'])
       Command(context, cmd=['ninja', '-C', '../out', '-j10'] + targets)
 
   if context['clang']:
     with Step('update_clang', status):
       Command(context, cmd=['../tools/clang/scripts/update.sh'])
 
   # Just build both bitages of validator and test for --validator mode.
   if context['validator']:
-    with Step('build ncval-x86-32', status):
-      SCons(context, platform='x86-32', parallel=True, args=['ncval'])
-    with Step('build ncval-x86-64', status):
-      SCons(context, platform='x86-64', parallel=True, args=['ncval'])
-
     with Step('build ragel_validator-32', status):
       SCons(context, platform='x86-32', parallel=True, args=['ncval_new'])
     with Step('build ragel_validator-64', status):
       SCons(context, platform='x86-64', parallel=True, args=['ncval_new'])
 
     with Step('predownload validator corpus', status):
       Command(context,
           cmd=[sys.executable,
                'tests/abi_corpus/validator_regression_test.py',
                '--download-only'])
 
-    with Step('validator_regression_test current x86-32', status,
-        halt_on_fail=False):
-      ValidatorTest(
-          context, 'x86-32', 'scons-out/opt-linux-x86-32/staging/ncval')
-    with Step('validator_regression_test current x86-64', status,
-        halt_on_fail=False):
-      ValidatorTest(
-          context, 'x86-64', 'scons-out/opt-linux-x86-64/staging/ncval')
-
     with Step('validator_regression_test ragel x86-32', status,
         halt_on_fail=False):
       ValidatorTest(
           context, 'x86-32',
           'scons-out/opt-linux-x86-32/staging/ncval_new')
     with Step('validator_regression_test ragel x86-64', status,
         halt_on_fail=False):
       ValidatorTest(
           context, 'x86-64',
           'scons-out/opt-linux-x86-64/staging/ncval_new')
 
-    with Step('validator_diff32_tests', status, halt_on_fail=False):
-      SCons(context, platform='x86-32', args=['validator_diff_tests'])
-    with Step('validator_diff64_tests', status, halt_on_fail=False):
-      SCons(context, platform='x86-64', args=['validator_diff_tests'])
     return
 
   # Run checkdeps script to vet #includes.
   with Step('checkdeps', status):
     Command(context, cmd=[sys.executable, 'tools/checkdeps/checkdeps.py'])
 
   # Make sure our Gyp build is working.
   if not context['no_gyp']:
     with Step('gyp_compile', status):
       CommandGypBuild(context)
@@ skipping 56 matching lines @@
     }[context['arch']]
     gn_sel_ldr = '../out/trusted_%s/sel_ldr' % arch_name
     with Step('small_tests under GN', status, halt_on_fail=False):
       SCons(context, args=['small_tests', 'force_sel_ldr=' + gn_sel_ldr])
     with Step('medium_tests under GN', status, halt_on_fail=False):
       SCons(context, args=['medium_tests', 'force_sel_ldr=' + gn_sel_ldr])
     with Step('large_tests under GN', status, halt_on_fail=False):
       SCons(context, args=['large_tests', 'force_sel_ldr=' + gn_sel_ldr])
   ### END GN tests ###
 
-  # Build with ragel-based validator using scons.
-  with Step('scons_compile_noragel', status):
-    SCons(context, parallel=True, args=['validator_ragel=0'])
-
-  # Smoke tests for the R-DFA validator.
-  with Step('validator_noragel_tests', status):
-    args = ['validator_ragel=0',
-            'small_tests',
-            'medium_tests',
-            'large_tests',
-            ]
-    # Add nacl_irt_test mode to be able to run run_hello_world_test_irt that
-    # tests validation of the IRT.
-    SCons(context,
-          mode=context['default_scons_mode'] + ['nacl_irt_test'],
-          args=args)
-
 
 def Main():
   # TODO(ncbray) make buildbot scripts composable to support toolchain use case.
   context = BuildContext()
   status = BuildStatus(context)
   ParseStandardCommandLine(context)
   SetupContextVars(context)
   if context.Windows():
     SetupWindowsEnvironment(context)
   elif context.Linux():
@@ skipping 12 matching lines @@
   start_time = time.time()
   try:
     Main()
   finally:
     time_taken = time.time() - start_time
     print 'RESULT BuildbotTime: total= %.3f minutes' % (time_taken / 60)
 
 
 if __name__ == '__main__':
   TimedMain()