diff options
| author | Antoni Boucher <bouanto@zoho.com> | 2023-06-12 20:51:29 -0400 |
|---|---|---|
| committer | Antoni Boucher <bouanto@zoho.com> | 2023-06-13 09:01:09 -0400 |
| commit | 9483008d71851eb9009d652f34c8dca4615cb737 (patch) | |
| tree | b2947719c2ae66a2617902ff9a8bd9ecd8f5a8f7 | |
| parent | 8bba64673c4fa7b19524efa563ae6233e0bda217 (diff) | |
| download | rust-9483008d71851eb9009d652f34c8dca4615cb737.tar.gz rust-9483008d71851eb9009d652f34c8dca4615cb737.zip | |
Tests for the CI
| -rwxr-xr-x | build_sysroot/build_sysroot.sh | 2 | ||||
| -rwxr-xr-x | test.sh | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/build_sysroot/build_sysroot.sh b/build_sysroot/build_sysroot.sh index dc80e4fff80..063219aabd2 100755 --- a/build_sysroot/build_sysroot.sh +++ b/build_sysroot/build_sysroot.sh @@ -30,7 +30,7 @@ mkdir -p sysroot/lib/rustlib/$TARGET_TRIPLE/lib/ cp -r target/$TARGET_TRIPLE/$sysroot_channel/deps/* sysroot/lib/rustlib/$TARGET_TRIPLE/lib/ # Since we can't override the sysroot for the UI tests anymore, we create a new toolchain and manually overwrite the sysroot directory. -my_toolchain_dir=$HOME/.rustup/toolchains/my_toolchain +my_toolchain_dir=$HOME/.rustup/toolchains/codegen_gcc_ui_tests rm -rf $my_toolchain_dir rust_toolchain=$(cat ../rust-toolchain | grep channel | sed 's/channel = "\(.*\)"/\1/') cp -r $HOME/.rustup/toolchains/$rust_toolchain-$TARGET_TRIPLE $my_toolchain_dir diff --git a/test.sh b/test.sh index a6e87fca162..6213ed49183 100755 --- a/test.sh +++ b/test.sh @@ -213,7 +213,7 @@ function setup_rustc() { rm config.toml || true - my_toolchain_dir=$HOME/.rustup/toolchains/my_toolchain + my_toolchain_dir=$HOME/.rustup/toolchains/codegen_gcc_ui_tests cat > config.toml <<EOF changelog-seen = 2 @@ -224,8 +224,10 @@ deny-warnings = false [build] cargo = "$my_toolchain_dir/bin/cargo" +#cargo = "$(rustup which cargo)" local-rebuild = true rustc = "$my_toolchain_dir/bin/rustc" +#rustc = "$HOME/.rustup/toolchains/$rust_toolchain-$TARGET_TRIPLE/bin/rustc" [target.x86_64-unknown-linux-gnu] llvm-filecheck = "`which FileCheck-10 || which FileCheck-11 || which FileCheck-12 || which FileCheck-13 || which FileCheck-14`" |