diff options
author | Karen Arutyunov <karen@codesynthesis.com> | 2017-02-09 23:16:28 +0300 |
---|---|---|
committer | Karen Arutyunov <karen@codesynthesis.com> | 2017-02-10 10:42:46 +0300 |
commit | 4219d7f14e5c63e251f83fd0fff32b707e412cd6 (patch) | |
tree | e1d2c4cd652d560d5a62e8ed881fa1b879b67c4f /build2 | |
parent | 2c1aff8bf09a50189c3d0b2ff86ab057ca009749 (diff) |
Fix save_regex()
Diffstat (limited to 'build2')
-rw-r--r-- | build2/test/script/runner.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
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); |