diff options
| author | bors <bors@rust-lang.org> | 2023-06-20 02:58:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-06-20 02:58:53 +0000 |
| commit | d7dcadc5976e0542e453b8dc5a7519212231987b (patch) | |
| tree | e20c91b4cbec71008ff99ccfa0406b04b5b431b3 /src/ci/docker/scripts | |
| parent | 14803bda0efc94b6c9a90048d868104c1ddf0685 (diff) | |
| parent | 0ca325231069091a5625d245a6d043058f11b17b (diff) | |
| download | rust-d7dcadc5976e0542e453b8dc5a7519212231987b.tar.gz rust-d7dcadc5976e0542e453b8dc5a7519212231987b.zip | |
Auto merge of #112817 - compiler-errors:rollup-0eqomra, r=compiler-errors
Rollup of 8 pull requests Successful merges: - #112232 (Better error for non const `PartialEq` call generated by `match`) - #112499 (Fix python linting errors) - #112596 (Suggest correct signature on missing fn returning RPITIT/AFIT) - #112606 (Alter `Display` for `Ipv6Addr` for IPv4-compatible addresses) - #112781 (Don't consider TAIT normalizable to hidden ty if it would result in impossible item bounds) - #112787 (Add gha problem matcher) - #112799 (Clean up "doc(hidden)" check) - #112803 (Format the examples directory of cg_clif) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci/docker/scripts')
| -rwxr-xr-x | src/ci/docker/scripts/android-sdk-manager.py | 17 | ||||
| -rwxr-xr-x | src/ci/docker/scripts/fuchsia-test-runner.py | 4 |
2 files changed, 10 insertions, 11 deletions
diff --git a/src/ci/docker/scripts/android-sdk-manager.py b/src/ci/docker/scripts/android-sdk-manager.py index c9e2961f6eb..66cba58427b 100755 --- a/src/ci/docker/scripts/android-sdk-manager.py +++ b/src/ci/docker/scripts/android-sdk-manager.py @@ -2,6 +2,14 @@ # Simpler reimplementation of Android's sdkmanager # Extra features of this implementation are pinning and mirroring +import argparse +import hashlib +import os +import subprocess +import tempfile +import urllib.request +import xml.etree.ElementTree as ET + # These URLs are the Google repositories containing the list of available # packages and their versions. The list has been generated by listing the URLs # fetched while executing `tools/bin/sdkmanager --list` @@ -27,15 +35,6 @@ MIRROR_BUCKET = "rust-lang-ci-mirrors" MIRROR_BUCKET_REGION = "us-west-1" MIRROR_BASE_DIR = "rustc/android/" -import argparse -import hashlib -import os -import subprocess -import sys -import tempfile -import urllib.request -import xml.etree.ElementTree as ET - class Package: def __init__(self, path, url, sha1, deps=None): if deps is None: diff --git a/src/ci/docker/scripts/fuchsia-test-runner.py b/src/ci/docker/scripts/fuchsia-test-runner.py index 73cf3de6a46..af01f9ccbbc 100755 --- a/src/ci/docker/scripts/fuchsia-test-runner.py +++ b/src/ci/docker/scripts/fuchsia-test-runner.py @@ -519,8 +519,8 @@ class TestEnvironment: env_vars += f'\n "{var_name}={var_value}",' # Default to no backtrace for test suite - if os.getenv("RUST_BACKTRACE") == None: - env_vars += f'\n "RUST_BACKTRACE=0",' + if os.getenv("RUST_BACKTRACE") is None: + env_vars += '\n "RUST_BACKTRACE=0",' # Use /tmp as the test temporary directory env_vars += f'\n "RUST_TEST_TMPDIR=/tmp",' |
