OLD | NEW |
1 #!/usr/bin/env python2 | 1 #!/usr/bin/env python2 |
2 | 2 |
3 import argparse | 3 import argparse |
4 import os | 4 import os |
5 import sys | 5 import sys |
6 | 6 |
7 import szbuild | 7 import szbuild |
8 | 8 |
9 from utils import FindBaseNaCl | 9 from utils import FindBaseNaCl |
10 | 10 |
(...skipping 15 matching lines...) Expand all Loading... |
26 | 26 |
27 argparser = argparse.ArgumentParser(description=main.__doc__) | 27 argparser = argparse.ArgumentParser(description=main.__doc__) |
28 szbuild.AddOptionalArgs(argparser) | 28 szbuild.AddOptionalArgs(argparser) |
29 argparser.add_argument('comps', nargs='*', default=components) | 29 argparser.add_argument('comps', nargs='*', default=components) |
30 args = argparser.parse_args() | 30 args = argparser.parse_args() |
31 bad = set(args.comps) - set(components) | 31 bad = set(args.comps) - set(components) |
32 if bad: | 32 if bad: |
33 print 'Unknown component{s}: '.format(s='s' if len(bad) > 1 else '') + \ | 33 print 'Unknown component{s}: '.format(s='s' if len(bad) > 1 else '') + \ |
34 ' '.join(x for x in bad) | 34 ' '.join(x for x in bad) |
35 sys.exit(1) | 35 sys.exit(1) |
| 36 |
| 37 # Fix up Subzero target strings for the run_all.sh script. |
| 38 target_map = { |
| 39 'arm32':'arm', |
| 40 'x8632':'x8632', |
| 41 'x8664':'x8664' |
| 42 } |
| 43 run_all_target = target_map[args.target] # fail if target not listed above |
| 44 |
36 suffix = ( | 45 suffix = ( |
37 'pnacl.opt.{target}' if args.sandbox else 'gcc.opt.{target}').format( | 46 'pnacl.opt.{target}' if args.sandbox else 'gcc.opt.{target}').format( |
38 target=args.target); | 47 target=run_all_target); |
39 for comp in args.comps: | 48 for comp in args.comps: |
40 name = os.path.splitext(comp)[1] or comp | 49 name = os.path.splitext(comp)[1] or comp |
41 if name[0] == '.': | 50 if name[0] == '.': |
42 name = name[1:] | 51 name = name[1:] |
43 szbuild.ProcessPexe(args, | 52 szbuild.ProcessPexe(args, |
44 ('{root}/tests/spec2k/{comp}/' + | 53 ('{root}/tests/spec2k/{comp}/' + |
45 '{name}.opt.stripped.pexe' | 54 '{name}.opt.stripped.pexe' |
46 ).format(root=nacl_root, comp=comp, name=name), | 55 ).format(root=nacl_root, comp=comp, name=name), |
47 ('{root}/tests/spec2k/{comp}/' + | 56 ('{root}/tests/spec2k/{comp}/' + |
48 '{name}.{suffix}' | 57 '{name}.{suffix}' |
49 ).format(root=nacl_root, comp=comp, name=name, | 58 ).format(root=nacl_root, comp=comp, name=name, |
50 suffix=suffix)) | 59 suffix=suffix)) |
51 | 60 |
52 if __name__ == '__main__': | 61 if __name__ == '__main__': |
53 main() | 62 main() |
OLD | NEW |