Eliminate bundle_size parameter from validator interface.

src/trusted/validator_x86/build.scons

 # -*- python -*-
 # Copyright (c) 2011 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 os
 import sys
 Import('env')
 
@@ skipping 330 matching lines @@
         command,
         stdin = __BaseTestFile(base, 'hex'),
         stdout_golden = __BaseTestFile(base, ext))
     __AddTest(test, test_env, base, ext, node_val, ['ncval_testing'])
 
 if test_env.Bit('ncval_testing') and test_env.Bit('target_x86_64'):
   for report_errors in [False, True]:
     __AddNcvalTestingTests(report_errors)
 
 # Run segment sandboxing tests using ncval on test files.
-def __AddNcvalSegmentTests(test_cpuid_all, test_stats, detailed, align_16):
+def __AddNcvalSegmentTests(test_cpuid_all, test_stats, detailed):
   if env.Bit('target_x86_32'):
     options = ['--hex_text=-',
                '--max_errors=-1']
     ext = 'nval'
     if (detailed):
       ext += 'd'
       options.append('--detailed')
     else:
       options.append('--detailed=false')
     if (test_stats):
       ext += 's'
       options.append('--stats')
-    if (align_16):
-      ext += '16'
-      options.append('--alignment=16')
-    else:
-      options.append('--alignment=32')

[Karl, 2012/04/17 22:20:12]

What are you going to do with the tests in

src/trusted/validator_x86/testdata/32
and
src/trusted/validator_x86/testdata/64

Both directories have 16-bit tests. Are you going to remove them?

[Nick Bray (chromium), 2012/04/17 22:42:02]

Good idea.  I'll check with Robert first, however, because this is a big review
to begin with.

     if test_cpuid_all:
       options.append('--cpuid-all')
     else:
       ext += '0'
       options.append('--cpuid-none')
     test = 'ncval32_hex'
     for base in __GoldenBases(ext):
       command = [ncval] + options
       node_val = test_env.CommandTest(
           __OutTestFile(test, base, ext),
           command,
           stdin = __BaseTestFile(base, 'hex'),
           stdout_golden = __BaseTestFile(base, ext))
       __AddTest(test, test_env, base, ext, node_val,
                 STANDARD_TESTS)
 
 for cpu_features_all in [False, True]:
   for test_stats in [False, True]:
     for detailed in [False, True]:
-      for align_16 in [False, True]:
-        __AddNcvalSegmentTests(cpu_features_all, test_stats,
-                               detailed, align_16)
+      __AddNcvalSegmentTests(cpu_features_all, test_stats, detailed)
 
 # Run tests for stubout on test files. The input file uses extension hex.
 def __AddNcValStuboutTests():
   test = 'ncval_stubout'
   options = ['--hex_text=-', '--stubout']
   ext = 'sval'
   for base in __GoldenBases(ext):
     command = [ncval] + options
     node_stubout = test_env.CommandTest(
         __OutTestFile(test, base, ext),
@@ skipping 22 matching lines @@
 __AddNegMaxErrors()
 
 if test_env.Bit('target_x86_64'):
   node = test_env.CommandTest('ncval_hello_x32.out',
                               [ncval,
                                env.File(os.path.join('${MAIN_DIR}/src/trusted',
                                                      'service_runtime',
                                                      'testdata/x86_64',
                                                      'hello_x32.nexe'))])
   env.AddNodeToTestSuite(node, STANDARD_TESTS, 'run_ncval_hello_x32_test')