diff options
| author | Josh Stone <jistone@redhat.com> | 2022-08-12 15:39:26 -0700 |
|---|---|---|
| committer | Josh Stone <jistone@redhat.com> | 2022-08-12 15:39:26 -0700 |
| commit | de8dedb0a524208e4856e80c22bc7f47df2fd91a (patch) | |
| tree | 77cd17c0284a6954a1993ec7041c52203af24ea1 /src | |
| parent | f22819bcce4abaff7d1246a56eec493418f9f4ee (diff) | |
Use an extensionless `x` script for non-Windows
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/mk/Makefile.in | 2 | ||||
| -rw-r--r-- | src/ci/docker/host-x86_64/x86_64-gnu-llvm-12/Dockerfile | 4 | ||||
| -rw-r--r-- | src/tools/tidy/src/bins.rs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in index 1e0f7e9acf4..9a08a7be0f5 100644 --- a/src/bootstrap/mk/Makefile.in +++ b/src/bootstrap/mk/Makefile.in @@ -80,7 +80,7 @@ TESTS_IN_MINGW_2 := \ src/test/ui ci-mingw-subset-1: - $(Q)$(CFG_SRC_DIR)/x.sh test --stage 2 $(TESTS_IN_MINGW_2:%=--exclude %) + $(Q)$(CFG_SRC_DIR)/x test --stage 2 $(TESTS_IN_MINGW_2:%=--exclude %) ci-mingw-subset-2: $(Q)$(BOOTSTRAP) test --stage 2 $(TESTS_IN_MINGW_2) diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-llvm-12/Dockerfile b/src/ci/docker/host-x86_64/x86_64-gnu-llvm-12/Dockerfile index 8de9045c3ba..14d0ffd7500 100644 --- a/src/ci/docker/host-x86_64/x86_64-gnu-llvm-12/Dockerfile +++ b/src/ci/docker/host-x86_64/x86_64-gnu-llvm-12/Dockerfile @@ -44,7 +44,7 @@ ENV RUST_CONFIGURE_ARGS \ --enable-llvm-link-shared \ --set rust.thin-lto-import-instr-limit=10 -# NOTE: intentionally uses all of `x.py`, `x.sh`, and `x.ps1` to make sure they all work on Linux. +# NOTE: intentionally uses all of `x.py`, `x`, and `x.ps1` to make sure they all work on Linux. ENV SCRIPT ../x.py --stage 2 test --exclude src/tools/tidy && \ # Run the `mir-opt` tests again but this time for a 32-bit target. # This enforces that tests using `// EMIT_MIR_FOR_EACH_BIT_WIDTH` have @@ -52,7 +52,7 @@ ENV SCRIPT ../x.py --stage 2 test --exclude src/tools/tidy && \ # the PR is approved and tested for merging. # It will also detect tests lacking `// EMIT_MIR_FOR_EACH_BIT_WIDTH`, # despite having different output on 32-bit vs 64-bit targets. - ../x.sh --stage 2 test src/test/mir-opt \ + ../x --stage 2 test src/test/mir-opt \ --host='' --target=i686-unknown-linux-gnu && \ # Run the UI test suite again, but in `--pass=check` mode # diff --git a/src/tools/tidy/src/bins.rs b/src/tools/tidy/src/bins.rs index 025b8ab9f0a..30903f56d93 100644 --- a/src/tools/tidy/src/bins.rs +++ b/src/tools/tidy/src/bins.rs @@ -98,7 +98,7 @@ mod os_impl { pub fn check(path: &Path, bad: &mut bool) { use std::ffi::OsStr; - const ALLOWED: &[&str] = &["configure"]; + const ALLOWED: &[&str] = &["configure", "x"]; crate::walk_no_read( path, |