From b61e9e2ba8e625a598427cc2990806b69d104a18 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Tue, 25 Oct 2016 16:47:00 +0300 Subject: Add support of file redirects to testscript parser --- build2/test/script/runner.cxx | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'build2/test/script/runner.cxx') diff --git a/build2/test/script/runner.cxx b/build2/test/script/runner.cxx index 995da4f..f065389 100644 --- a/build2/test/script/runner.cxx +++ b/build2/test/script/runner.cxx @@ -64,7 +64,11 @@ namespace build2 { ofdstream os (orp); sp.cleanups.emplace_back (orp); - os << rd.value; + + os << (rd.type == redirect_type::here_string + ? rd.str + : rd.doc.doc); + os.close (); } catch (const io_error& e) @@ -298,11 +302,12 @@ namespace build2 so.close (); se.close (); - if (c.in.type == redirect_type::here_string || - c.in.type == redirect_type::here_document) + const redirect& r (c.in); + if (r.type == redirect_type::here_string || + r.type == redirect_type::here_document) { ofdstream os (pr.out_fd); - os << c.in.value; + os << (r.type == redirect_type::here_string ? r.str : r.doc.doc); os.close (); } -- cgit v1.1