From 4219d7f14e5c63e251f83fd0fff32b707e412cd6 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 9 Feb 2017 23:16:28 +0300
Subject: Fix save_regex()

---
 build2/test/script/runner.cxx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'build2')

diff --git a/build2/test/script/runner.cxx b/build2/test/script/runner.cxx
index 4047b5a..ffb95e8 100644
--- a/build2/test/script/runner.cxx
+++ b/build2/test/script/runner.cxx
@@ -431,8 +431,7 @@ namespace build2
             //
             // test/1/stdout.regex~di
             //
-            if (rd.type == redirect_type::here_doc_regex &&
-                !rl.flags.empty ())
+            if (rd.type == redirect_type::here_doc_regex && !rl.flags.empty ())
               rp += "~" + rl.flags;
 
             // Note that if would be more efficient to directly write chunks
@@ -441,10 +440,11 @@ namespace build2
             // already failed.
             //
             string s;
-            for (const auto& l: rl.lines)
+            for (auto b (rl.lines.cbegin ()), i (b), e (rl.lines.cend ());
+                 i != e; ++i)
             {
-              if (!s.empty ()) s += '\n';
-              s += line (l);
+              if (i != b) s += '\n';
+              s += line (*i);
             }
 
             save (rp, s, ll);
-- 
cgit v1.1