Rename S environment variable to SOURCE_ROOT in run-make tests

Kobzol · Kobzol · commit eac63b77257d · 2024-06-07T09:20:58.000+02:00
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
@@ -3566,7 +3566,7 @@ impl<'test> TestCx<'test> {
             .env(dylib_env_var(), &dylib_env_paths)
             .env("TARGET", &self.config.target)
             .env("PYTHON", &self.config.python)
-            .env("S", &src_root)
+            .env("SOURCE_ROOT", &src_root)
             .env("RUST_BUILD_STAGE", &self.config.stage_id)
             .env("RUSTC", cwd.join(&self.config.rustc_path))
             .env("TMPDIR", &rmake_out_dir)
diff --git a/src/tools/run-make-support/src/lib.rs b/src/tools/run-make-support/src/lib.rs
@@ -89,7 +89,7 @@ pub fn htmldocck() -> Command {
 
 /// Path to the root rust-lang/rust source checkout.
 pub fn source_root() -> PathBuf {
-    env_var("S").into()
+    env_var("SOURCE_ROOT").into()
 }
 
 /// Construct the static library name based on the platform.

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ pub fn htmldocck() -> Command {`
`89`	`89`
`90`	`90`	`/// Path to the root rust-lang/rust source checkout.`
`91`	`91`	`pub fn source_root() -> PathBuf {`
`92`		`- env_var("S").into()`
	`92`	`+ env_var("SOURCE_ROOT").into()`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`/// Construct the static library name based on the platform.`