compiletest: rename compile_lib_path -> host_compile_lib_path

Author: jieyouxu

src/tools/compiletest/src/common.rs

@@ -252,10 +252,7 @@ pub struct Config {
     ///
     /// For example:
     /// - `/home/ferris/rust/build/x86_64-unknown-linux-gnu/stage1/bin/lib`
-    ///
-    /// FIXME: maybe rename this to reflect (1) which target platform (host, not target), and (2)
-    /// which `rustc` (the `rustc`-under-test, not the stage 0 `rustc` unless forced).
-    pub compile_lib_path: Utf8PathBuf,
+    pub host_compile_lib_path: Utf8PathBuf,
 
     /// Path to libraries needed to run the compiled executable for the **target** platform. This
     /// corresponds to the **target** sysroot libraries, including the **target** standard library.
@@ -1093,7 +1090,7 @@ fn query_rustc_output(config: &Config, args: &[&str], envs: HashMap<String, Stri
     let query_rustc_path = config.query_rustc_path.as_deref().unwrap_or(&config.rustc_path);
 
     let mut command = Command::new(query_rustc_path);
-    add_dylib_path(&mut command, iter::once(&config.compile_lib_path));
+    add_dylib_path(&mut command, iter::once(&config.host_compile_lib_path));
     command.args(&config.target_rustcflags).args(args);
     command.env("RUSTC_BOOTSTRAP", "1");
     command.envs(envs);

src/tools/compiletest/src/directives/needs.rs

@@ -367,7 +367,7 @@ impl CachedNeedsConditions {
             //
             // However, `rust-lld` is only located under the lib path, so we look for it there.
             rust_lld: config
-                .compile_lib_path
+                .host_compile_lib_path
                 .parent()
                 .expect("couldn't traverse to the parent of the specified --compile-lib-path")
                 .join("lib")

src/tools/compiletest/src/lib.rs

@@ -375,7 +375,7 @@ fn parse_config(args: Vec<String>) -> Config {
         fail_fast: matches.opt_present("fail-fast")
             || env::var_os("RUSTC_TEST_FAIL_FAST").is_some(),
 
-        compile_lib_path: make_absolute(opt_path(matches, "compile-lib-path")),
+        host_compile_lib_path: make_absolute(opt_path(matches, "compile-lib-path")),
         run_lib_path: make_absolute(opt_path(matches, "run-lib-path")),
         rustc_path: opt_path(matches, "rustc-path"),
         cargo_path: matches.opt_str("cargo-path").map(Utf8PathBuf::from),

src/tools/compiletest/src/runtest.rs

@@ -458,7 +458,7 @@ impl<'test> TestCx<'test> {
 
         self.compose_and_run(
             rustc,
-            self.config.compile_lib_path.as_path(),
+            self.config.host_compile_lib_path.as_path(),
             Some(aux_dir.as_path()),
             src,
         )
@@ -1321,7 +1321,7 @@ impl<'test> TestCx<'test> {
         self.props.unset_rustc_env.iter().fold(&mut rustc, Command::env_remove);
         self.compose_and_run(
             rustc,
-            self.config.compile_lib_path.as_path(),
+            self.config.host_compile_lib_path.as_path(),
             Some(aux_dir.as_path()),
             input,
         )
@@ -1344,7 +1344,8 @@ impl<'test> TestCx<'test> {
         rustc.arg("-Cpanic=abort");
         rustc.args(self.props.minicore_compile_flags.clone());
 
-        let res = self.compose_and_run(rustc, self.config.compile_lib_path.as_path(), None, None);
+        let res =
+            self.compose_and_run(rustc, self.config.host_compile_lib_path.as_path(), None, None);
         if !res.status.success() {
             self.fatal_proc_rec(
                 &format!("auxiliary build of {} failed to compile: ", self.config.minicore_path),
@@ -1458,7 +1459,7 @@ impl<'test> TestCx<'test> {
 
         let auxres = aux_cx.compose_and_run(
             aux_rustc,
-            aux_cx.config.compile_lib_path.as_path(),
+            aux_cx.config.host_compile_lib_path.as_path(),
             Some(aux_dir.as_path()),
             None,
         );

src/tools/compiletest/src/runtest/run_make.rs

@@ -172,7 +172,7 @@ impl TestCx<'_> {
             .env(dylib_env_var(), &env::join_paths(recipe_dylib_search_paths).unwrap())
             // Provide the directory to libraries that are needed to run the *compiler* invoked
             // by the recipe.
-            .env("HOST_RUSTC_DYLIB_PATH", &self.config.compile_lib_path)
+            .env("HOST_RUSTC_DYLIB_PATH", &self.config.host_compile_lib_path)
             // Provide the directory to libraries that might be needed to run binaries created
             // by a compiler invoked by the recipe.
             .env("TARGET_EXE_DYLIB_PATH", &self.config.run_lib_path)

src/tools/compiletest/src/rustdoc_gui_test.rs

@@ -58,7 +58,7 @@ fn incomplete_config_for_rustdoc_gui_test() -> Config {
         edition: Default::default(),
         bless: Default::default(),
         fail_fast: Default::default(),
-        compile_lib_path: Utf8PathBuf::default(),
+        host_compile_lib_path: Utf8PathBuf::default(),
         run_lib_path: Utf8PathBuf::default(),
         rustc_path: Utf8PathBuf::default(),
         cargo_path: Default::default(),