about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOrion Gonzalez <ardi@ardis.dev>2024-10-03 03:15:32 +0200
committerOrion Gonzalez <ardi@ardis.dev>2024-10-22 19:08:55 +0200
commit73238301f452a801fc66b63eaa8fb463bfbac0d1 (patch)
tree6094fabf0e97c0508a1a00981138e59fbbb8033e
parentbca5fdebe0e539d123f33df5f2149d5976392e76 (diff)
downloadrust-73238301f452a801fc66b63eaa8fb463bfbac0d1.tar.gz
rust-73238301f452a801fc66b63eaa8fb463bfbac0d1.zip
add an option for a custom differ
-rw-r--r--src/tools/compiletest/src/common.rs2
-rw-r--r--src/tools/compiletest/src/lib.rs1
2 files changed, 3 insertions, 0 deletions
diff --git a/src/tools/compiletest/src/common.rs b/src/tools/compiletest/src/common.rs
index ff059940f7c..5e50e227ded 100644
--- a/src/tools/compiletest/src/common.rs
+++ b/src/tools/compiletest/src/common.rs
@@ -387,6 +387,8 @@ pub struct Config {
     /// True if the profiler runtime is enabled for this target.
     /// Used by the "needs-profiler-runtime" directive in test files.
     pub profiler_runtime: bool,
+
+    pub diff_command: Option<String>,
 }
 
 impl Config {
diff --git a/src/tools/compiletest/src/lib.rs b/src/tools/compiletest/src/lib.rs
index 7d6ede9bcda..5046eea63e2 100644
--- a/src/tools/compiletest/src/lib.rs
+++ b/src/tools/compiletest/src/lib.rs
@@ -364,6 +364,7 @@ pub fn parse_config(args: Vec<String>) -> Config {
         git_merge_commit_email: matches.opt_str("git-merge-commit-email").unwrap(),
 
         profiler_runtime: matches.opt_present("profiler-runtime"),
+        diff_command: env::var("COMPILETEST_DIFF_TOOL").ok(),
     }
 }