mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compiletest/rmake: prune unused RUST_BUILD_STAGE and explain env vars passed to recipes

Browse Source
This commit is contained in:
许杰友 Jieyou Xu (Joe) 2024-07-19 10:24:25 +00:00
parent 993d83af71
commit 3e77f7c9a5
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/tools/compiletest/src/runtest.rs
View File

@ -3598,7 +3598,7 @@ impl<'test> TestCx<'test> {
}; };
// Calculate the paths of the recipe binary. As previously discussed, this is placed at // Calculate the paths of the recipe binary. As previously discussed, this is placed at
// `<base_dir>/<bin_name>` with `bin_name` being `rmake` or `rmake.exe` dependending on // `<base_dir>/<bin_name>` with `bin_name` being `rmake` or `rmake.exe` depending on
// platform. // platform.
let recipe_bin = { let recipe_bin = {
let mut p = base_dir.join("rmake"); let mut p = base_dir.join("rmake");
@ -3611,7 +3611,6 @@ impl<'test> TestCx<'test> {
// FIXME(jieyouxu): audit these env vars. some of them only makes sense for make, not rustc! // FIXME(jieyouxu): audit these env vars. some of them only makes sense for make, not rustc!
let mut rustc = Command::new(&self.config.rustc_path); let mut rustc = Command::new(&self.config.rustc_path);
rustc rustc
// Specify output path
.arg("-o") .arg("-o")
.arg(&recipe_bin) .arg(&recipe_bin)
// Specify library search paths for `run_make_support`. // Specify library search paths for `run_make_support`.
@ -3622,9 +3621,7 @@ impl<'test> TestCx<'test> {
// `extern run_make_support;`. // `extern run_make_support;`.
.arg("--extern") .arg("--extern")
.arg(format!("run_make_support={}", &support_lib_path.to_string_lossy())) .arg(format!("run_make_support={}", &support_lib_path.to_string_lossy()))
// Default to Edition 2021.
.arg("--edition=2021") .arg("--edition=2021")
// The recipe file itself.
.arg(&self.testpaths.file.join("rmake.rs")) .arg(&self.testpaths.file.join("rmake.rs"))
// Provide necessary library search paths for rustc. // Provide necessary library search paths for rustc.
.env(dylib_env_var(), &env::join_paths(host_dylib_search_paths).unwrap()); .env(dylib_env_var(), &env::join_paths(host_dylib_search_paths).unwrap());
@ -3696,20 +3693,37 @@ impl<'test> TestCx<'test> {
// FIXME(jieyouxu): explain what the hecc we are doing here. // FIXME(jieyouxu): explain what the hecc we are doing here.
// FIXME(jieyouxu): audit these env vars. some of them only makes sense for make, not rustc! // FIXME(jieyouxu): audit these env vars. some of them only makes sense for make, not rustc!
// FIXME(jieyouxu): please rename `TARGET_RPATH_ENV`, `HOST_RPATH_DIR` and
// `TARGET_RPATH_DIR`, it is **extremely** confusing!
let mut cmd = Command::new(&recipe_bin); let mut cmd = Command::new(&recipe_bin);
cmd.current_dir(&rmake_out_dir) cmd.current_dir(&rmake_out_dir)
.stdout(Stdio::piped()) .stdout(Stdio::piped())
.stderr(Stdio::piped()) .stderr(Stdio::piped())
// Provide the target-specific env var that is used to record dylib search paths. For
// example, this could be `LD_LIBRARY_PATH` on some linux distros but `PATH` on Windows.
.env("LD_LIB_PATH_ENVVAR", dylib_env_var()) .env("LD_LIB_PATH_ENVVAR", dylib_env_var())
.env("TARGET_RPATH_ENV", &env::join_paths(target_runtime_dylib_search_paths).unwrap()) // Provide the dylib search paths.
.env(dylib_env_var(), &env::join_paths(recipe_dylib_search_paths).unwrap()) .env(dylib_env_var(), &env::join_paths(recipe_dylib_search_paths).unwrap())
// Provide runtime dylib search paths.
.env("TARGET_RPATH_ENV", &env::join_paths(target_runtime_dylib_search_paths).unwrap())
// Provide the target.
.env("TARGET", &self.config.target) .env("TARGET", &self.config.target)
// Some tests unfortunately still need Python, so provide path to a Python interpreter.
.env("PYTHON", &self.config.python) .env("PYTHON", &self.config.python)
// Provide path to checkout root. This is the top-level directory containing
// rust-lang/rust checkout.
.env("SOURCE_ROOT", &source_root) .env("SOURCE_ROOT", &source_root)
.env("RUST_BUILD_STAGE", &self.config.stage_id) // Provide path to stage-corresponding rustc.
.env("RUSTC", &self.config.rustc_path) .env("RUSTC", &self.config.rustc_path)
// Provide the directory to libraries that are needed to run the *compiler*. This is not
// to be confused with `TARGET_RPATH_ENV` or `TARGET_RPATH_DIR`. This is needed if the
// recipe wants to invoke rustc.
.env("HOST_RPATH_DIR", &self.config.compile_lib_path) .env("HOST_RPATH_DIR", &self.config.compile_lib_path)
// Provide the directory to libraries that might be needed to run compiled binaries
// (further compiled by the recipe!).
.env("TARGET_RPATH_DIR", &self.config.run_lib_path) .env("TARGET_RPATH_DIR", &self.config.run_lib_path)
// Provide which LLVM components are available (e.g. which LLVM components are provided
// through a specific CI runner).
.env("LLVM_COMPONENTS", &self.config.llvm_components); .env("LLVM_COMPONENTS", &self.config.llvm_components);
if let Some(ref rustdoc) = self.config.rustdoc_path { if let Some(ref rustdoc) = self.config.rustdoc_path {