about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2024-02-17 18:47:41 +0100
committerGitHub <noreply@github.com>2024-02-17 18:47:41 +0100
commit60cc6b93f6490eab960e90664215c989515d2f06 (patch)
tree49d62a837936cee7f65af110599abd0c8e67be1d
parent45d577370415c3b16770b0abdfae8ec106909348 (diff)
parent0925ff8300ed724f1a1760c0bedd7522f49b3203 (diff)
downloadrust-60cc6b93f6490eab960e90664215c989515d2f06.tar.gz
rust-60cc6b93f6490eab960e90664215c989515d2f06.zip
Rollup merge of #121091 - onur-ozkan:bypass-stage0-download-in-tests, r=albertlarsan68
use build.rustc config and skip-stage0-validation flag

This change helps us to bypass downloading the beta compiler in bootstrap tests.

more context: https://rust-lang.zulipchat.com/#narrow/stream/326414-t-infra.2Fbootstrap/topic/tests.20causing.20downloads.20of.20native.20rustc.20for.20other.20platforms/near/421467975
-rw-r--r--src/bootstrap/src/core/config/tests.rs12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/bootstrap/src/core/config/tests.rs b/src/bootstrap/src/core/config/tests.rs
index 0ae466eca7d..6ac573c68df 100644
--- a/src/bootstrap/src/core/config/tests.rs
+++ b/src/bootstrap/src/core/config/tests.rs
@@ -11,9 +11,15 @@ use std::{
 };
 
 fn parse(config: &str) -> Config {
-    Config::parse_inner(&["check".to_owned(), "--config=/does/not/exist".to_owned()], |&_| {
-        toml::from_str(config).unwrap()
-    })
+    let config = format!("{config} \r\n build.rustc = \"/does-not-exists\" ");
+    Config::parse_inner(
+        &[
+            "check".to_owned(),
+            "--config=/does/not/exist".to_owned(),
+            "--skip-stage0-validation".to_owned(),
+        ],
+        |&_| toml::from_str(&config).unwrap(),
+    )
 }
 
 #[test]