Tests for the CI

Author: antoyo

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

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
@@ -223,9 +223,11 @@ codegen-backends = []
 deny-warnings = false
 
 [build]
-cargo = "$my_toolchain_dir/bin/cargo"
+#cargo = "$my_toolchain_dir/bin/cargo"
+cargo = "$(rustup which cargo)"
 local-rebuild = true
-rustc = "$my_toolchain_dir/bin/rustc"
+#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`"