aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-06-05 14:52:14 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-06-11 19:07:32 +0200
commit9ae6fd626ed2ca0b7eff64bda68ca84463e66b84 (patch)
tree1396882aa7f207f1485690f1caf86c69aa05605f
parent4218bfe7668d55e36814d6bdcec2da40454025c1 (diff)
Temporarily add --strip-trailing-cr to diff options in test module
-rw-r--r--build2/test/module.cxx2
-rw-r--r--build2/test/rule.cxx1
2 files changed, 3 insertions, 0 deletions
diff --git a/build2/test/module.cxx b/build2/test/module.cxx
index 3ae9996..e5b044a 100644
--- a/build2/test/module.cxx
+++ b/build2/test/module.cxx
@@ -68,6 +68,8 @@ namespace build2
const dir_path& out_root (root.out_path ());
l5 ([&]{trace << "for " << out_root;});
+ //@@ Need ability to specify extra diff options (--strip-trailing-cr).
+
// Register rules.
//
{
diff --git a/build2/test/rule.cxx b/build2/test/rule.cxx
index 8a4c15d..2dc4abd 100644
--- a/build2/test/rule.cxx
+++ b/build2/test/rule.cxx
@@ -338,6 +338,7 @@ namespace build2
assert (!ot.path ().empty ()); // Should have been assigned by update.
args.push_back ("diff");
+ args.push_back ("--strip-trailing-cr"); //@@ TMP: see module.cxx
args.push_back ("-u");
args.push_back (ot.path ().string ().c_str ());
args.push_back ("-");