diff options
Diffstat (limited to 'build2/test')
| -rw-r--r-- | build2/test/rule.cxx | 11 | ||||
| -rw-r--r-- | build2/test/script/builtin.cxx | 12 | ||||
| -rw-r--r-- | build2/test/script/parser.cxx | 11 |
3 files changed, 5 insertions, 29 deletions
diff --git a/build2/test/rule.cxx b/build2/test/rule.cxx index 8e39104..bc90c1f 100644 --- a/build2/test/rule.cxx +++ b/build2/test/rule.cxx @@ -367,7 +367,7 @@ namespace build2 perform_script_impl (const target& t, const testscript& ts, const dir_path& wd, - const common& c) noexcept + const common& c) { using namespace script; @@ -397,13 +397,6 @@ namespace build2 { r = scope_state::failed; } - catch (const std::exception& e) - { - diag_lock l; - *diag_stream << "unhandled exception: " << e << endl; - assert (false); - abort (); - } return r; } @@ -525,7 +518,7 @@ namespace build2 const target& t, const testscript& ts, const dir_path& wd, - const diag_frame* ds) noexcept + const diag_frame* ds) { diag_frame df (ds); r = perform_script_impl (t, ts, wd, *this); diff --git a/build2/test/script/builtin.cxx b/build2/test/script/builtin.cxx index 9bd6a1b..a2f3107 100644 --- a/build2/test/script/builtin.cxx +++ b/build2/test/script/builtin.cxx @@ -1355,17 +1355,7 @@ namespace build2 auto_fd in, auto_fd out, auto_fd err, uint8_t& r) noexcept { - try - { - r = fn (sp, args, move (in), move (out), move (err)); - } - catch (const std::exception& e) - { - diag_lock l; - *diag_stream << "unhandled exception: " << e << endl; - assert (false); - abort (); - } + r = fn (sp, args, move (in), move (out), move (err)); } // Run builtin implementation asynchronously. diff --git a/build2/test/script/parser.cxx b/build2/test/script/parser.cxx index d6d77fe..350ca44 100644 --- a/build2/test/script/parser.cxx +++ b/build2/test/script/parser.cxx @@ -2868,7 +2868,7 @@ namespace build2 } static void - execute_impl (scope& s, script& scr, runner& r) noexcept + execute_impl (scope& s, script& scr, runner& r) { try { @@ -2879,13 +2879,6 @@ namespace build2 { s.state = scope_state::failed; } - catch (const std::exception& e) - { - diag_lock l; - *diag_stream << "unhandled exception: " << e << endl; - assert (false); - abort (); - } } void parser:: @@ -3007,7 +3000,7 @@ namespace build2 [] (scope& s, script& scr, runner& r, - const diag_frame* ds) noexcept + const diag_frame* ds) { diag_frame df (ds); execute_impl (s, scr, r); |