Add support of paths cleanups to testscript runner

1 files changed, 9 insertions, 0 deletions

diff --git a/build2/test/script/runner.cxx b/build2/test/script/runner.cxx
index 79cbfc4..23a4a5c 100644
--- a/build2/test/script/runner.cxx
+++ b/build2/test/script/runner.cxx
@@ -189,6 +189,10 @@ namespace build2
         //
         // Note that we operate with normalized paths here.
         //
+        // @@ What if to make cleanup insensitive to the registration order,
+        //    and sorting paths properly prior removal? Would it produce any
+        //    testing flaws?
+        //
         set<path> rp;
         for (auto& p: reverse_iterate (sp.cleanups))
         {
@@ -414,6 +418,11 @@ namespace build2
             //
             pr.wait ();
 
+            // Register command-created paths for cleanup.
+            //
+            for (const auto& p: c.cleanups)
+              sp.cleanups.emplace_back (normalize (p));
+
             // If there is no correct exit status by whatever reason then dump
             // stderr (if cached), print the proper diagnostics and fail.
             //