From 542ad9696f50e33fa20e735c14c052720c55bc3a Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 23 Aug 2019 14:35:53 +0200
Subject: dry_run

---
 libbuild2/test/rule.cxx | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

(limited to 'libbuild2/test/rule.cxx')

diff --git a/libbuild2/test/rule.cxx b/libbuild2/test/rule.cxx
index bd412f5..c0ece26 100644
--- a/libbuild2/test/rule.cxx
+++ b/libbuild2/test/rule.cxx
@@ -438,7 +438,7 @@ namespace build2
       if (cast_false<bool> (rs.vars[ctx.var_forwarded]))
       {
         bl = bs.src_path () / wd.leaf (bs.out_path ());
-        clean_backlink (bl, verb_never);
+        clean_backlink (ctx, bl, verb_never);
       }
 
       // If this is a (potentially) multi-testscript test, then create (and
@@ -479,7 +479,7 @@ namespace build2
         // Remove the directory itself not to confuse the runner which tries
         // to detect when tests stomp on each others feet.
         //
-        build2::rmdir_r (wd, true, 2);
+        rmdir_r (ctx, wd, true, 2);
       }
 
       // Delay actually creating the directory in case all the tests are
@@ -491,7 +491,7 @@ namespace build2
       //
       wait_guard wg;
 
-      if (!dry_run)
+      if (!ctx.dry_run)
         wg = wait_guard (ctx, ctx.count_busy (), t[a].task_count);
 
       // Result vector.
@@ -516,11 +516,11 @@ namespace build2
           // don't clean the existing one), we are going to ignore it for
           // dry-run.
           //
-          if (!dry_run)
+          if (!ctx.dry_run)
           {
             if (mk)
             {
-              mkdir_buildignore (wd, buildignore_file, 2);
+              mkdir_buildignore (ctx, wd, buildignore_file, 2);
               mk = false;
             }
           }
@@ -534,9 +534,11 @@ namespace build2
               dr << ' ' << t;
           }
 
-          res.push_back (dry_run ? scope_state::passed : scope_state::unknown);
+          res.push_back (ctx.dry_run
+                         ? scope_state::passed
+                         : scope_state::unknown);
 
-          if (!dry_run)
+          if (!ctx.dry_run)
           {
             scope_state& r (res.back ());
 
@@ -567,7 +569,7 @@ namespace build2
         }
       }
 
-      if (!dry_run)
+      if (!ctx.dry_run)
         wg.wait ();
 
       // Re-examine.
@@ -588,7 +590,7 @@ namespace build2
 
       // Cleanup.
       //
-      if (!dry_run)
+      if (!ctx.dry_run)
       {
         if (!bad && !one && !mk && after == output_after::clean)
         {
@@ -596,7 +598,7 @@ namespace build2
             fail << "working directory " << wd << " is not empty at the "
                  << "end of the test";
 
-          rmdir_buildignore (wd, buildignore_file, 2);
+          rmdir_buildignore (ctx, wd, buildignore_file, 2);
         }
       }
 
@@ -605,8 +607,10 @@ namespace build2
       // If we dry-run then presumably all tests passed and we shouldn't
       // have anything left unless we are keeping the output.
       //
-      if (!bl.empty () && (dry_run ? after == output_after::keep : exists (wd)))
-        update_backlink (wd, bl, true /* changed */);
+      if (!bl.empty () && (ctx.dry_run
+                           ? after == output_after::keep
+                           : exists (wd)))
+        update_backlink (ctx, wd, bl, true /* changed */);
 
       if (bad)
         throw failed ();
@@ -679,6 +683,8 @@ namespace build2
     target_state rule::
     perform_test (action a, const target& tt, size_t pass_n) const
     {
+      context& ctx (tt.ctx);
+
       // First pass through.
       //
       if (pass_n != 0)
@@ -779,7 +785,7 @@ namespace build2
 
         cat = process (process_exit (0)); // Successfully exited.
 
-        if (!dry_run)
+        if (!ctx.dry_run)
         {
           try
           {
@@ -800,7 +806,7 @@ namespace build2
 
       // If dry-run, the target may not exist.
       //
-      process_path pp (!dry_run
+      process_path pp (!ctx.dry_run
                        ? run_search     (p, true /* init */)
                        : try_run_search (p, true));
       args.push_back (pp.empty () ? p.string ().c_str () : pp.recall_string ());
@@ -865,7 +871,7 @@ namespace build2
       else if (verb)
         text << "test " << tt;
 
-      if (!dry_run)
+      if (!ctx.dry_run)
       {
         diag_record dr;
         if (!run_test (tt,
-- 
cgit v1.1