diff options
Diffstat (limited to 'src/unittest.cc')
| -rw-r--r-- | src/unittest.cc | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/unittest.cc b/src/unittest.cc index ade2d0a..237b2e3 100644 --- a/src/unittest.cc +++ b/src/unittest.cc @@ -6,29 +6,33 @@ #include <iostream> #include "execute.h" -#include "settings.h" #include "task.h" -int runUnitTests(std::list<std::shared_ptr<Task>>& tasks, - const Settings& settings) +int runUnitTests(std::set<std::shared_ptr<Task>>& tasks, + const ctor::settings& settings) { bool ok{true}; - std::cout << "Running unit-tests:\n"; + std::cout << "Running unit-tests:" << std::endl; // Run unit-tests for(const auto& task : tasks) { - if(task->targetType() == TargetType::UnitTest) + if(task->targetType() == ctor::target_type::unit_test) { - std::cout << task->name() << ": "; - auto ret = execute(task->target(), {}, false); + auto name = task->name(); + if(name.empty()) + { + name = task->target(); + } + std::cout << name << ": " << std::flush; + auto ret = execute(task->targetFile(), {}, settings.verbose > 0); ok &= ret == 0; if(ret == 0) { - std::cout << "OK\n"; + std::cout << " OK" << std::endl; } else { - std::cout << "FAILED\n"; + std::cout << " FAILED" << std::endl; } } } |