OLD | NEW |
1 #!/usr/bin/python | 1 #!/usr/bin/python |
2 # Copyright (c) 2013 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2013 The Native Client Authors. All rights reserved. |
3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
5 | 5 |
6 from buildbot_lib import ( | 6 from buildbot_lib import ( |
7 BuildContext, BuildStatus, ParseStandardCommandLine, | 7 BuildContext, BuildStatus, ParseStandardCommandLine, |
8 RemoveSconsBuildDirectories, RunBuild, SetupLinuxEnvironment, | 8 RemoveSconsBuildDirectories, RunBuild, SetupLinuxEnvironment, |
9 SetupMacEnvironment, SetupWindowsEnvironment, SCons, Step ) | 9 SetupMacEnvironment, SetupWindowsEnvironment, SCons, Step ) |
10 | 10 |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
107 'malloc_realloc_calloc_free', 'dup', 'cond_timedwait', | 107 'malloc_realloc_calloc_free', 'dup', 'cond_timedwait', |
108 'getpid']] | 108 'getpid']] |
109 else: | 109 else: |
110 # TODO(mseaborn): Use the same test list as on Linux when the threading | 110 # TODO(mseaborn): Use the same test list as on Linux when the threading |
111 # tests pass for Mac. | 111 # tests pass for Mac. |
112 tests = ['run_hello_world_test_irt'] | 112 tests = ['run_hello_world_test_irt'] |
113 with Step('unsandboxed_tests ' + arch, status, halt_on_fail=False): | 113 with Step('unsandboxed_tests ' + arch, status, halt_on_fail=False): |
114 SCons(context, parallel=True, mode=irt_mode, | 114 SCons(context, parallel=True, mode=irt_mode, |
115 args=flags_run + ['pnacl_unsandboxed=1'] + tests) | 115 args=flags_run + ['pnacl_unsandboxed=1'] + tests) |
116 | 116 |
| 117 # Test MinSFI. |
| 118 if not context.Windows() and (arch == 'x86-32' or arch == 'x86-64'): |
| 119 with Step('minsfi_tests ' + arch, status, halt_on_fail=False): |
| 120 SCons(context, parallel=True, |
| 121 args=flags_run + ['minsfi=1', 'minsfi_tests']) |
117 | 122 |
118 def Main(): | 123 def Main(): |
119 context = BuildContext() | 124 context = BuildContext() |
120 status = BuildStatus(context) | 125 status = BuildStatus(context) |
121 ParseStandardCommandLine(context) | 126 ParseStandardCommandLine(context) |
122 | 127 |
123 if context.Linux(): | 128 if context.Linux(): |
124 SetupLinuxEnvironment(context) | 129 SetupLinuxEnvironment(context) |
125 elif context.Windows(): | 130 elif context.Windows(): |
126 SetupWindowsEnvironment(context) | 131 SetupWindowsEnvironment(context) |
127 elif context.Mac(): | 132 elif context.Mac(): |
128 SetupMacEnvironment(context) | 133 SetupMacEnvironment(context) |
129 else: | 134 else: |
130 raise Exception('Unsupported platform') | 135 raise Exception('Unsupported platform') |
131 | 136 |
132 RunBuild(RunSconsTests, status) | 137 RunBuild(RunSconsTests, status) |
133 | 138 |
134 if __name__ == '__main__': | 139 if __name__ == '__main__': |
135 Main() | 140 Main() |
OLD | NEW |