diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-02-08 07:42:41 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-02-13 12:42:42 +0200 |
| commit | 5cefca444f7062c61cc9d118ffea5901e05186fd (patch) | |
| tree | 879d608f9a9084c7eaa4e5cb8bcad5650d966730 /build2/test | |
| parent | db2a696f810e41189bcdf5524696ff3d0cfbe5a9 (diff) | |
Implement parallel operation execution
Diffstat (limited to 'build2/test')
| -rw-r--r-- | build2/test/rule.cxx | 13 | ||||
| -rw-r--r-- | build2/test/script/regex.cxx | 6 |
2 files changed, 7 insertions, 12 deletions
diff --git a/build2/test/rule.cxx b/build2/test/rule.cxx index 35302e1..9dc24cd 100644 --- a/build2/test/rule.cxx +++ b/build2/test/rule.cxx @@ -291,7 +291,7 @@ namespace build2 { build2::match (ml, a, *it); - if (it->state () == target_state::unchanged) + if (it->synchronized_state () == target_state::unchanged) //@@ TM? { unmatch (a, *it); it = nullptr; @@ -304,7 +304,7 @@ namespace build2 { build2::match (ml, a, *ot); - if (ot->state () == target_state::unchanged) + if (ot->synchronized_state () == target_state::unchanged) //@@ MT? { unmatch (a, *ot); ot = nullptr; @@ -337,13 +337,8 @@ namespace build2 // target_state r (execute_delegate (dr, a, t)); - if (it != nullptr) - r |= execute (a, *it); - - if (ot != nullptr) - r |= execute (a, *ot); - - return r; + const target* ts[] = {it, ot}; + return r |= straight_execute_members (a, t, ts); }; } else diff --git a/build2/test/script/regex.cxx b/build2/test/script/regex.cxx index 48e1eeb..b77f8a5 100644 --- a/build2/test/script/regex.cxx +++ b/build2/test/script/regex.cxx @@ -17,13 +17,13 @@ namespace build2 namespace regex { static_assert (alignof (char_string) % 4 == 0, - "inappropriate allignment for char_string"); + "unexpected char_string alignment"); static_assert (alignof (char_regex) % 4 == 0, - "inappropriate allignment for char_regex"); + "unexpected char_regex alignment"); static_assert (sizeof (uintptr_t) > sizeof (int16_t), - "inappropriate uintptr_t size"); + "unexpected uintptr_t size"); const line_char line_char::nul (0); const line_char line_char::eof (-1); |