From 8d08bdafc69870d9fb2b208a31b842382ca4a19e Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Sun, 29 Oct 2017 22:34:22 +0300
Subject: Pass --text option for diff utility on Windows

---
 build2/test/rule.cxx | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'build2/test')

diff --git a/build2/test/rule.cxx b/build2/test/rule.cxx
index 05f3988..869c23b 100644
--- a/build2/test/rule.cxx
+++ b/build2/test/rule.cxx
@@ -774,6 +774,14 @@ namespace build2
         args.push_back (dpp.recall_string ());
         args.push_back ("-u");
 
+        // Note that MinGW-built diff utility (as of 3.3) fails trying to
+        // detect if STDIN contains text or binary data. We will help it a bit
+        // to workaround the issue.
+        //
+#ifdef _WIN32
+        args.push_back ("--text");
+#endif
+
         // Ignore Windows newline fluff if that's what we are running on.
         //
         if (cast<target_triplet> (tt["test.target"]).class_ == "windows")
-- 
cgit v1.1