1 files changed, 45 insertions, 24 deletions
diff --git a/tests/manifest-roundtrip/driver.cxx b/tests/manifest-roundtrip/driver.cxx
index 53b688e..c63a729 100644
--- a/tests/manifest-roundtrip/driver.cxx
+++ b/tests/manifest-roundtrip/driver.cxx
@@ -1,45 +1,60 @@
 // file      : tests/manifest-roundtrip/driver.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <cassert>
-
-#ifndef __cpp_lib_modules_ts
 #include <string>
 #include <iostream>
-#endif
-
-// Other includes.
-
-#ifdef __cpp_modules_ts
-#ifdef __cpp_lib_modules_ts
-import std.core;
-import std.io;
-#endif
-import butl.utility;             // operator<<(ostream, exception)
-import butl.fdstream;
-import butl.manifest_parser;
-import butl.manifest_serializer;
-#else
-#include <libbutl/utility.mxx>
-#include <libbutl/fdstream.mxx>
-#include <libbutl/manifest-parser.mxx>
-#include <libbutl/manifest-serializer.mxx>
-#endif
+
+#include <libbutl/utility.hxx>             // operator<<(ostream, exception)
+#include <libbutl/fdstream.hxx>
+#include <libbutl/manifest-parser.hxx>
+#include <libbutl/manifest-serializer.hxx>
+
+#undef NDEBUG
+#include <cassert>
 
 using namespace std;
 using namespace butl;
 
+// Usage: argv[0] [-m]
+//
+// Round-trip a manifest reading it from stdin and printing to stdout.
+//
+// -m
+//    Serialize multi-line manifest values using the v2 form.
+//
+// -s
+//    Split values into the value/comment pairs and merge them back before
+//    printing.
+//
 int
-main ()
+main (int argc, const char* argv[])
 try
 {
+  bool multiline_v2 (false);
+  bool split (false);
+
+  for (int i (1); i != argc; ++i)
+  {
+    string v (argv[i]);
+
+    if (v == "-m")
+      multiline_v2 = true;
+    else if (v == "-s")
+      split = true;
+  }
+
   // Read/write in binary mode.
   //
   stdin_fdmode  (fdstream_mode::binary);
   stdout_fdmode (fdstream_mode::binary);
 
   manifest_parser p (cin, "stdin");
-  manifest_serializer s (cout, "stdout");
+
+  manifest_serializer s (cout,
+                         "stdout",
+                         false /* long_lines */,
+                         {} /* filter */,
+                         multiline_v2);
 
   for (bool eom (true), eos (false); !eos; )
   {
@@ -53,6 +68,12 @@ try
     else
       eom = false;
 
+    if (split)
+    {
+      const auto& vc (manifest_parser::split_comment (nv.value));
+      nv.value = manifest_serializer::merge_comment (vc.first, vc.second);
+    }
+
     s.next (nv.name, nv.value);
   }
 }