diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2014-12-26 23:16:56 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2014-12-26 23:16:56 +0000 |
| commit | 9d63400fed8960b99f9cffe9a9ceb97f4ce818bd (patch) | |
| tree | aa78b91848b0daa6f1aaed8bfdcca8a7b567f0d9 /test/bbackupd/testbbackupd.cpp | |
| parent | f48f84fd4d991536e395d7a95280a9c246d4af93 (diff) | |
Don't try to kill daemons at beginning of each deselected test.
This just results in huge console noise if we can't kill a daemon for some
reason. Kill them once, after all tests have run, instead.
Diffstat (limited to 'test/bbackupd/testbbackupd.cpp')
| -rw-r--r-- | test/bbackupd/testbbackupd.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/bbackupd/testbbackupd.cpp b/test/bbackupd/testbbackupd.cpp index f84625ce..21aa7520 100644 --- a/test/bbackupd/testbbackupd.cpp +++ b/test/bbackupd/testbbackupd.cpp @@ -469,10 +469,10 @@ int num_tests_selected = 0; //! Simplifies calling setUp() with the current function name in each test. #define SETUP() \ - TEST_THAT(kill_running_daemons()); \ if (!setUp(__FUNCTION__)) return true; \ num_tests_selected++; \ - int old_failure_count = failures; + int old_failure_count = failures; \ + TEST_THAT(kill_running_daemons()); #define SETUP_WITHOUT_FILES() \ SETUP() \ @@ -4214,6 +4214,7 @@ int test(int argc, const char *argv[]) TEST_LINE(num_tests_selected > 0, "No tests matched the patterns " "specified on the command line"); + TEST_THAT(kill_running_daemons()); return (failures == 0 && num_tests_selected > 0); } |