Skip to content

Commit

Permalink
Unit test logging fixes (RIPD-1568):
Browse files Browse the repository at this point in the history
* Check message queue before shutting down unit tests
* Logging should be on if not quiet
  • Loading branch information
seelabs committed Dec 6, 2017
1 parent 090d813 commit 4a50d40
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/test/unit_test/multi_runner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,8 @@ multi_runner_parent::multi_runner_parent()
{
message_queue_thread_ = std::thread([this] {
std::vector<char> buf(1 << 20);
while (this->continue_message_queue_)
while (this->continue_message_queue_ ||
this->message_queue_->get_num_msg())
{
// let children know the parent is still alive
this->inc_keep_alive_count();
Expand Down Expand Up @@ -423,7 +424,7 @@ multi_runner_child::multi_runner_child(
: job_index_{checkout_job_index()}
, num_jobs_{num_jobs}
, quiet_{quiet}
, print_log_{print_log}
, print_log_{!quiet || print_log}
{
// incPort twice (2*jobIndex_) because some tests need two envs
for (std::size_t i = 0; i < 2 * job_index_; ++i)
Expand Down

0 comments on commit 4a50d40

Please sign in to comment.