| 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 import argparse | 6 import argparse |
| 7 import logging | 7 import logging |
| 8 import os | 8 import os |
| 9 import platform | 9 import platform |
| 10 import subprocess | 10 import subprocess |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 139 # process all the archives that are present. We can't just leave out the | 139 # process all the archives that are present. We can't just leave out the |
| 140 # the non-canonical packages entirely because they are extracted by the | 140 # the non-canonical packages entirely because they are extracted by the |
| 141 # package_version tool. | 141 # package_version tool. |
| 142 # First build only the packages that will be uploaded, and upload them. | 142 # First build only the packages that will be uploaded, and upload them. |
| 143 RunWithLog(ToolchainBuildCmd(sync=True, extra_flags=['--canonical-only'])) | 143 RunWithLog(ToolchainBuildCmd(sync=True, extra_flags=['--canonical-only'])) |
| 144 | 144 |
| 145 if args.skip_tests: | 145 if args.skip_tests: |
| 146 sys.exit(0) | 146 sys.exit(0) |
| 147 | 147 |
| 148 if args.buildbot or args.trybot: | 148 if args.buildbot or args.trybot: |
| 149 # Don't upload package descriptions when sanitizing, since the | 149 # Don't upload packages from the 32-bit linux bot to avoid racing on |
| 150 # package names are the same as for the unsanitized versions. | 150 # uploading the same packages as the 64-bit linux bot |
| 151 if not args.sanitize: | 151 if host_os != 'linux' or pynacl.platform.IsArch64Bit(): |
| 152 # Don't upload packages from the 32-bit linux bot to avoid racing on | 152 packages.UploadPackages(TEMP_PACKAGES_FILE, args.trybot, args.sanitizer) |
| 153 # uploading the same packages as the 64-bit linux bot | |
| 154 if host_os != 'linux' or pynacl.platform.IsArch64Bit(): | |
| 155 packages.UploadPackages(TEMP_PACKAGES_FILE, args.trybot) | |
| 156 | 153 |
| 157 # Since windows bots don't build target libraries or run tests yet, Run a basic | 154 # Since windows bots don't build target libraries or run tests yet, Run a basic |
| 158 # sanity check that tests the host components (LLVM, binutils, gold plugin). | 155 # sanity check that tests the host components (LLVM, binutils, gold plugin). |
| 159 # Then exit, since the rest of this file is just test running. | 156 # Then exit, since the rest of this file is just test running. |
| 160 # For now full test coverage is only achieved on the main waterfall bots. | 157 # For now full test coverage is only achieved on the main waterfall bots. |
| 161 if host_os == 'win': | 158 if host_os == 'win': |
| 162 packages.ExtractPackages(TEMP_PACKAGES_FILE, overlay_packages=False) | 159 packages.ExtractPackages(TEMP_PACKAGES_FILE, overlay_packages=False) |
| 163 with buildbot_lib.Step('Test host binaries and gold plugin', status, | 160 with buildbot_lib.Step('Test host binaries and gold plugin', status, |
| 164 halt_on_fail=False): | 161 halt_on_fail=False): |
| 165 buildbot_lib.Command( | 162 buildbot_lib.Command( |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 227 | 224 |
| 228 if args.buildbot: | 225 if args.buildbot: |
| 229 trybot_mode = 'false' | 226 trybot_mode = 'false' |
| 230 else: | 227 else: |
| 231 trybot_mode = 'true' | 228 trybot_mode = 'true' |
| 232 | 229 |
| 233 platform_arg = 'mode-buildbot-tc-' + arch + '-linux' | 230 platform_arg = 'mode-buildbot-tc-' + arch + '-linux' |
| 234 | 231 |
| 235 command = ['bash', buildbot_shell, platform_arg, trybot_mode] | 232 command = ['bash', buildbot_shell, platform_arg, trybot_mode] |
| 236 RunWithLog(command) | 233 RunWithLog(command) |
| OLD | NEW |