diff options
Diffstat (limited to 'build2/test')
-rw-r--r-- | build2/test/rule.cxx | 11 | ||||
-rw-r--r-- | build2/test/script/runner.cxx | 19 |
2 files changed, 3 insertions, 27 deletions
diff --git a/build2/test/rule.cxx b/build2/test/rule.cxx index 869c23b..96941e6 100644 --- a/build2/test/rule.cxx +++ b/build2/test/rule.cxx @@ -639,16 +639,7 @@ namespace build2 dr << error; print_process (dr, args); - - if (!pe.normal ()) - { - dr << " terminated abnormally: " << pe.description (); - - if (pe.core ()) - dr << " (core dumped)"; - } - else - dr << " exited with code " << static_cast<uint16_t> (pe.code ()); + dr << " " << pe; } return pr && wr; diff --git a/build2/test/script/runner.cxx b/build2/test/script/runner.cxx index 2377774..cddd3a7 100644 --- a/build2/test/script/runner.cxx +++ b/build2/test/script/runner.cxx @@ -344,17 +344,7 @@ namespace build2 { diag_record d (fail (ll)); print_process (d, args); - - if (!pe.normal ()) - { - d << " terminated abnormally: " << pe.description (); - - if (pe.core ()) - d << " (core dumped)"; - } - else - d << " exited with code " - << static_cast<uint16_t> (pe.code ()); + d << " " << pe; } // Output doesn't match the expected result. @@ -1683,12 +1673,7 @@ namespace build2 diag_record d (valid ? error (ll) : fail (ll)); if (!exit->normal ()) - { - d << pr << " terminated abnormally: " << exit->description (); - - if (exit->core ()) - d << " (core dumped)"; - } + d << pr << " " << *exit; else { uint16_t ec (exit->code ()); // Make sure is printed as integer. |