summaryrefslogtreecommitdiff
path: root/src/unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/unittest.cc')
-rw-r--r--src/unittest.cc16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/unittest.cc b/src/unittest.cc
index ade2d0a..f18de47 100644
--- a/src/unittest.cc
+++ b/src/unittest.cc
@@ -6,10 +6,9 @@
#include <iostream>
#include "execute.h"
-#include "settings.h"
#include "task.h"
-int runUnitTests(std::list<std::shared_ptr<Task>>& tasks,
+int runUnitTests(std::set<std::shared_ptr<Task>>& tasks,
const Settings& settings)
{
bool ok{true};
@@ -19,16 +18,21 @@ int runUnitTests(std::list<std::shared_ptr<Task>>& tasks,
{
if(task->targetType() == TargetType::UnitTest)
{
- 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\n";
}
else
{
- std::cout << "FAILED\n";
+ std::cout << " FAILED\n";
}
}
}