Add option to force filetype=asm for testing

pydir/crosstest_generator.py

 #!/usr/bin/env python2
 
 import argparse
 import ConfigParser
 import os
 import shutil
 import sys
 
 from utils import shellcmd
 from utils import FindBaseNaCl
@@ skipping 89 matching lines @@
                          default=('{root}/toolchain_build/src/subzero/' +
                                   'crosstest/Output').format(root=root),
                          help='Output directory')
   argparser.add_argument('--lit', default=False, action='store_true',
                          help='Generate files for lit testing')
   argparser.add_argument('--toolchain-root', dest='toolchain_root',
                          default=(
                            '{root}/toolchain/linux_x86/pnacl_newlib_raw/bin'
                          ).format(root=root),
                          help='Path to toolchain binaries.')
+  argparser.add_argument('--filetype', default=None, dest='filetype',
+                         help='File type for compilation {asm, iasm, obj}.')

[Jim Stichnoth, 2016/01/10 03:08:55]

I suggest documenting this something like "...file type override..."

[sehr, 2016/01/11 21:49:47]

I'm not sure I totally got what you're saying, but have attempted.

   args = argparser.parse_args()
 
   # Run from the crosstest directory to make it easy to grab inputs.
   crosstest_dir = '{root}/toolchain_build/src/subzero/crosstest'.format(
     root=root)
   os.chdir(crosstest_dir)
 
   tests = ConfigParser.RawConfigParser()
   tests.read('crosstest.cfg')
 
@@ skipping 25 matching lines @@
       for sb in sandboxing:
         for opt in opt_levels:
           for attr in arch_attrs[target]:
             desc = [ test, target, sb, opt, attr ]
             if Match(set(desc), includes, excludes, default_match):
               exe = '{test}_{target}_{sb}_{opt}_{attr}'.format(
                 test=test, target=target, sb=sb, opt=opt,
                 attr=attr)
               extra = (tests.get(test, 'flags').split(' ')
                        if tests.has_option(test, 'flags') else [])
+              if args.filetype:
+                extra += ['--filetype={ftype}'.format(ftype=args.filetype)]
               # Generate the compile command.
               cmp_cmd = (
                 ['{path}/crosstest.py'.format(path=pypath),
                  '-{opt}'.format(opt=opt),
                  '--mattr={attr}'.format(attr=attr),
                  '--prefix=Subzero_',
                  '--target={target}'.format(target=target),
                  '--nonsfi={nsfi}'.format(nsfi='1' if sb=='nonsfi' else '0'),
                  '--sandbox={sb}'.format(sb='1' if sb=='sandbox' else '0'),
                  '--dir={dir}'.format(dir=args.dir),
@@ skipping 30 matching lines @@
                            echo=args.verbose)
                 if (args.defer):
                   deferred_cmds.append(run_cmd)
                 else:
                   shellcmd(run_cmd, echo=True)
   for run_cmd in deferred_cmds:
     shellcmd(run_cmd, echo=True)
 
 if __name__ == '__main__':
   main()