stop building/testing old x86 validator.

buildbot/buildbot_standard.py

Index: buildbot/buildbot_standard.py
diff --git a/buildbot/buildbot_standard.py b/buildbot/buildbot_standard.py
index 8fde845b29c99a017039acf69f5f2418c75d4b2f..6bc49c5d0682e50be54d4cf697cd6d23fc78b71a 100644
--- a/buildbot/buildbot_standard.py
+++ b/buildbot/buildbot_standard.py
@@ -190,11 +190,6 @@ def BuildScript(status, context):
 
   # 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):
@@ -206,15 +201,6 @@ def BuildScript(status, context):
                '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(
@@ -226,10 +212,6 @@ def BuildScript(status, context):
           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.
@@ -306,23 +288,6 @@ def BuildScript(status, context):
       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.