1 files changed, 63 insertions, 16 deletions

diff --git a/libbuild2/test/script/parser.test.cxx b/libbuild2/test/script/parser.test.cxx
index e0dd3d2..6838e47 100644
--- a/libbuild2/test/script/parser.test.cxx
+++ b/libbuild2/test/script/parser.test.cxx
@@ -33,8 +33,11 @@ namespace build2
       class print_runner: public runner
       {
       public:
-        print_runner (bool scope, bool id, bool line)
-            : scope_ (scope), id_ (id), line_ (line) {}
+        print_runner (bool scope, bool id, bool line, bool iterations)
+            : scope_ (scope),
+              id_ (id),
+              line_ (line),
+              iterations_ (iterations) {}
 
         virtual bool
         test (scope&) const override
@@ -97,11 +100,32 @@ namespace build2
         }
 
         virtual void
-        run (scope&,
+        run (scope& env,
              const command_expr& e, command_type t,
-             size_t i,
-             const location&) override
+             const iteration_index* ii, size_t i,
+             const function<command_function>& cf,
+             const location& ll) override
         {
+          // If the functions is specified, then just execute it with an empty
+          // stdin so it can perform the housekeeping (stop replaying tokens,
+          // increment line index, etc).
+          //
+          if (cf != nullptr)
+          {
+            assert (e.size () == 1 && !e[0].pipe.empty ());
+
+            const command& c (e[0].pipe.back ());
+
+            // Must be enforced by the caller.
+            //
+            assert (!c.out && !c.err && !c.exit);
+
+            cf (env, c.arguments,
+                fdopen_null (), nullptr /* pipe */,
+                nullopt /* deadline */,
+                ll);
+          }
+
           const char* s (nullptr);
 
           switch (t)
@@ -113,22 +137,22 @@ namespace build2
 
           cout << ind_ << s << e;
 
-          if (line_)
-            cout << " # " << i;
+          if (line_ || iterations_)
+            print_line_info (ii, i);
 
           cout << endl;
         }
 
         virtual bool
-        run_if (scope&,
-                const command_expr& e,
-                size_t i,
-                const location&) override
+        run_cond (scope&,
+                  const command_expr& e,
+                  const iteration_index* ii, size_t i,
+                  const location&) override
         {
           cout << ind_ << "? " << e;
 
-          if (line_)
-            cout << " # " << i;
+          if (line_ || iterations_)
+            print_line_info (ii, i);
 
           cout << endl;
 
@@ -146,13 +170,33 @@ namespace build2
         }
 
       private:
+        void
+        print_line_info (const iteration_index* ii, size_t i) const
+        {
+          cout << " #";
+
+          if (line_)
+            cout << ' ' << i;
+
+          if (iterations_ && ii != nullptr)
+          {
+            string s;
+            for (const iteration_index* i (ii); i != nullptr; i = i->prev)
+              s.insert (0, " i" + to_string (i->index));
+
+            cout << s;
+          }
+        }
+
+      private:
         bool scope_;
         bool id_;
         bool line_;
+        bool iterations_;
         string ind_;
       };
 
-      // Usage: argv[0] [-s] [-i] [-l] [<testscript-name>]
+      // Usage: argv[0] [-s] [-i] [-l] [-r] [<testscript-name>]
       //
       int
       main (int argc, char* argv[])
@@ -174,6 +218,7 @@ namespace build2
         bool scope (false);
         bool id (false);
         bool line (false);
+        bool iterations (false);
         path name;
 
         for (int i (1); i != argc; ++i)
@@ -186,6 +231,8 @@ namespace build2
             id = true;
           else if (a == "-l")
             line = true;
+          else if (a == "-r")
+            iterations = true;
           else
           {
             name = path (move (a));
@@ -218,7 +265,7 @@ namespace build2
             tt.assign (
               ctx.var_pool.rw ().insert<target_triplet> ("test.target")));
 
-          v = cast<target_triplet> (ctx.global_scope["build.host"]);
+          v = *ctx.build_host;
 
           testscript& st (
             ctx.targets.insert<testscript> (work,
@@ -236,7 +283,7 @@ namespace build2
           script s (tt, st, dir_path (work) /= "test-driver");
           p.pre_parse (cin, s);
 
-          print_runner r (scope, id, line);
+          print_runner r (scope, id, line, iterations);
           p.execute (s, r);
         }
         catch (const failed&)