From 430e46f7e352b1146f289e82f614d0b68c75aab5 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 15 Mar 2017 18:38:03 +0200
Subject: Implement parallel testscript execution for single target

---
 build2/test/script/parser.cxx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'build2/test/script/parser.cxx')

diff --git a/build2/test/script/parser.cxx b/build2/test/script/parser.cxx
index fd21a58..9d17304 100644
--- a/build2/test/script/parser.cxx
+++ b/build2/test/script/parser.cxx
@@ -2832,8 +2832,8 @@ namespace build2
 
         if (!s.empty ())
           execute (s, s, r);
-
-        s.state = scope_state::passed;
+        else
+          s.state = scope_state::passed;
       }
 
       void parser::
@@ -2972,7 +2972,7 @@ namespace build2
               //
               if (!sched.async (task_count,
                                 [] (scope& s, script& scr, runner& r,
-                                    const diag_frame* ds)
+                                    const diag_frame* ds) noexcept
                                 {
                                   diag_frame df (ds);
 
@@ -2980,7 +2980,6 @@ namespace build2
                                   {
                                     parser p;
                                     p.execute (s, scr, r);
-                                    s.state = scope_state::passed;
                                   }
                                   catch (const failed&)
                                   {
@@ -3024,6 +3023,8 @@ namespace build2
           assert (false);
 
         runner_->leave (*scope_, scope_->end_loc_);
+
+        scope_->state = scope_state::passed;
       }
 
       void parser::
-- 
cgit v1.1