aboutsummaryrefslogtreecommitdiff
path: root/build2/test/script/script
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2016-10-26 21:22:10 +0300
committerBoris Kolpackov <boris@codesynthesis.com>2016-11-04 09:26:36 +0200
commit023d8d8b040d5fce821080b016b4ce25eb67550d (patch)
tree9524aa8cb18bcca33ec89f4cd4ef2b87fb3a65e8 /build2/test/script/script
parent5daf46f700217521e8ba90c4be0e0369105544df (diff)
Add support of merge redirect to testscript parser
Diffstat (limited to 'build2/test/script/script')
-rw-r--r--build2/test/script/script2
1 files changed, 2 insertions, 0 deletions
diff --git a/build2/test/script/script b/build2/test/script/script
index 574760e..f0d8f21 100644
--- a/build2/test/script/script
+++ b/build2/test/script/script
@@ -43,6 +43,7 @@ namespace build2
none,
pass,
null,
+ merge,
here_string,
here_document,
file
@@ -67,6 +68,7 @@ namespace build2
union
{
+ int fd; // Used with 'merge' type.
string str; // Note: includes trailing newline, if required.
doc_type doc;
file_type file;