squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Use an extensionless x script for non-Windows

Browse source
This commit is contained in:
Josh Stone 2022-08-12 15:39:26 -07:00
parent f22819bcce
commit de8dedb0a5
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/bootstrap/mk/Makefile.in
View file

@ -80,7 +80,7 @@ TESTS_IN_MINGW_2 := \
src/test/ui src/test/ui
ci-mingw-subset-1: 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: ci-mingw-subset-2:
$(Q)$(BOOTSTRAP) test --stage 2 $(TESTS_IN_MINGW_2) $(Q)$(BOOTSTRAP) test --stage 2 $(TESTS_IN_MINGW_2)

4
src/ci/docker/host-x86_64/x86_64-gnu-llvm-12/Dockerfile
View file

@ -44,7 +44,7 @@ ENV RUST_CONFIGURE_ARGS \
--enable-llvm-link-shared \ --enable-llvm-link-shared \
--set rust.thin-lto-import-instr-limit=10 --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 && \ 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. # 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 # 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. # the PR is approved and tested for merging.
# It will also detect tests lacking `// EMIT_MIR_FOR_EACH_BIT_WIDTH`, # It will also detect tests lacking `// EMIT_MIR_FOR_EACH_BIT_WIDTH`,
# despite having different output on 32-bit vs 64-bit targets. # 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 && \ --host='' --target=i686-unknown-linux-gnu && \
# Run the UI test suite again, but in `--pass=check` mode # Run the UI test suite again, but in `--pass=check` mode
# #

2
src/tools/tidy/src/bins.rs
View file

@ -98,7 +98,7 @@ mod os_impl {
pub fn check(path: &Path, bad: &mut bool) { pub fn check(path: &Path, bad: &mut bool) {
use std::ffi::OsStr; use std::ffi::OsStr;
const ALLOWED: &[&str] = &["configure"]; const ALLOWED: &[&str] = &["configure", "x"];
crate::walk_no_read( crate::walk_no_read(
path, path,

0
x.sh → x
View file

2
x.ps1
View file

@ -1,6 +1,6 @@
#!/usr/bin/env pwsh #!/usr/bin/env pwsh
# See x.sh for why these scripts exist. # See ./x for why these scripts exist.
$xpy = Join-Path $PSScriptRoot x.py $xpy = Join-Path $PSScriptRoot x.py
# Start-Process for some reason splits arguments on spaces. (Isn't powershell supposed to be simpler than bash?) # Start-Process for some reason splits arguments on spaces. (Isn't powershell supposed to be simpler than bash?)

2
x.py
View file

@ -1,6 +1,6 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# Some systems don't have `python3` in their PATH. This isn't supported by x.py directly; # Some systems don't have `python3` in their PATH. This isn't supported by x.py directly;
# they should use `x.sh` or `x.ps1` instead. # they should use `x` or `x.ps1` instead.
# This file is only a "symlink" to bootstrap.py, all logic should go there. # This file is only a "symlink" to bootstrap.py, all logic should go there.