Register --minicore-path config and //@ use-minicore test props

Author: jieyouxu

src/tools/compiletest/src/command-list.rs

@@ -240,5 +240,6 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
     "unset-rustc-env",
     // Used by the tidy check `unknown_revision`.
     "unused-revision-names",
+    "use-minicore",
     // tidy-alphabetical-end
 ];

src/tools/compiletest/src/common.rs

@@ -392,6 +392,11 @@ pub struct Config {
     /// True if the profiler runtime is enabled for this target.
     /// Used by the "needs-profiler-support" header in test files.
     pub profiler_support: bool,
+
+    /// Path to minicore aux library, used for tests that need std and core stubs in
+    /// cross-compilation scenarios that do not otherwise need to `-Zbuild-std`. Used in e.g. ABI
+    /// tests.
+    pub minicore_path: PathBuf,
 }
 
 impl Config {

src/tools/compiletest/src/header.rs

@@ -218,6 +218,9 @@ pub struct TestProps {
     pub filecheck_flags: Vec<String>,
     /// Don't automatically insert any `--check-cfg` args
     pub no_auto_check_cfg: bool,
+    /// Build and use minicore as std/core stub for tests in cross-compilation scenarios that don't
+    /// otherwise need `-Z build-std`.
+    pub use_minicore: bool,
 }
 
 mod directives {
@@ -263,6 +266,7 @@ mod directives {
     pub const LLVM_COV_FLAGS: &'static str = "llvm-cov-flags";
     pub const FILECHECK_FLAGS: &'static str = "filecheck-flags";
     pub const NO_AUTO_CHECK_CFG: &'static str = "no-auto-check-cfg";
+    pub const USE_MINICORE: &'static str = "use-minicore";
     // This isn't a real directive, just one that is probably mistyped often
     pub const INCORRECT_COMPILER_FLAGS: &'static str = "compiler-flags";
 }
@@ -322,6 +326,7 @@ impl TestProps {
             llvm_cov_flags: vec![],
             filecheck_flags: vec![],
             no_auto_check_cfg: false,
+            use_minicore: false,
         }
     }
 
@@ -597,6 +602,8 @@ impl TestProps {
                     }
 
                     config.set_name_directive(ln, NO_AUTO_CHECK_CFG, &mut self.no_auto_check_cfg);
+
+                    self.update_use_minicore(ln, config);
                 },
             );
 
@@ -710,6 +717,17 @@ impl TestProps {
     pub fn local_pass_mode(&self) -> Option<PassMode> {
         self.pass_mode
     }
+
+    pub fn update_use_minicore(&mut self, ln: &str, config: &Config) {
+        let use_minicore = config.parse_name_directive(ln, directives::USE_MINICORE);
+        if use_minicore {
+            if !matches!(config.mode, Mode::Ui | Mode::Codegen | Mode::Assembly) {
+                panic!("`use-minicore` is only supported for ui, codegen and assembly test modes");
+            }
+
+            self.use_minicore = use_minicore;
+        }
+    }
 }
 
 /// Extract an `(Option<line_revision>, directive)` directive from a line if comment is present.

src/tools/compiletest/src/header/tests.rs

@@ -149,6 +149,7 @@ impl ConfigBuilder {
             "--git-repository=",
             "--nightly-branch=",
             "--git-merge-commit-email=",
+            "--minicore-path=",
         ];
         let mut args: Vec<String> = args.iter().map(ToString::to_string).collect();
 

src/tools/compiletest/src/lib.rs

@@ -170,7 +170,8 @@ pub fn parse_config(args: Vec<String>) -> Config {
             "git-merge-commit-email",
             "email address used for finding merge commits",
             "EMAIL",
-        );
+        )
+        .reqopt("", "minicore-path", "path to minicore aux library", "PATH");
 
     let (argv0, args_) = args.split_first().unwrap();
     if args.len() == 1 || args[1] == "-h" || args[1] == "--help" {
@@ -357,6 +358,8 @@ pub fn parse_config(args: Vec<String>) -> Config {
         git_merge_commit_email: matches.opt_str("git-merge-commit-email").unwrap(),
 
         profiler_support: matches.opt_present("profiler-support"),
+
+        minicore_path: opt_path(matches, "minicore-path"),
     }
 }
 
@@ -394,6 +397,7 @@ pub fn log_config(config: &Config) {
     logv(c, format!("host-linker: {:?}", config.host_linker));
     logv(c, format!("verbose: {}", config.verbose));
     logv(c, format!("format: {:?}", config.format));
+    logv(c, format!("minicore_path: {:?}", config.minicore_path.display()));
     logv(c, "\n".to_string());
 }