aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/buildgraph
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2013-01-31 18:23:59 +0100
committerChristian Kandeler <christian.kandeler@digia.com>2013-02-06 10:36:05 +0100
commitaea6cbfa9d96f3f76bbc3b81362c54c9322b3fcb (patch)
treec140b905b53b01e509ad923a12e5b31f043f3361 /tests/auto/buildgraph
parente5545733e8f63f62d499e73a27a72fc898a58e4e (diff)
Remove global log sink.
Applications may not want to use the same log sink for all builds. The logging facility is also decoupled from the command-line client in other ways: - The LogWriter modifiers for output channel and text color are gone, since this type of decision should not be made by low-level code. Instead, the "highlight" string can be forwarded to the log sink. - The console logger now lives in app/shared, as it must never be used by library code. Change-Id: I8863a554c9b74577320ef23f6f934a74e0f0cbb0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tests/auto/buildgraph')
-rw-r--r--tests/auto/buildgraph/buildgraph.pro5
-rw-r--r--tests/auto/buildgraph/tst_buildgraph.cpp3
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/auto/buildgraph/buildgraph.pro b/tests/auto/buildgraph/buildgraph.pro
index 31255e088..2e9dc3bdf 100644
--- a/tests/auto/buildgraph/buildgraph.pro
+++ b/tests/auto/buildgraph/buildgraph.pro
@@ -7,10 +7,11 @@ DEFINES += SRCDIR=\\\"$$PWD/\\\"
QT = core testlib
CONFIG += depend_includepath testcase
-include(../../../src/lib/use.pri)
-
HEADERS += \
tst_buildgraph.h
SOURCES += \
tst_buildgraph.cpp
+
+include(../../../src/lib/use.pri)
+include(../../../src/app/shared/logging/logging.pri)
diff --git a/tests/auto/buildgraph/tst_buildgraph.cpp b/tests/auto/buildgraph/tst_buildgraph.cpp
index b9c2e7354..1d49dd779 100644
--- a/tests/auto/buildgraph/tst_buildgraph.cpp
+++ b/tests/auto/buildgraph/tst_buildgraph.cpp
@@ -28,6 +28,7 @@
****************************************************************************/
#include "tst_buildgraph.h"
+#include <app/shared/logging/consolelogger.h>
#include <buildgraph/artifact.h>
#include <buildgraph/buildproduct.h>
#include <buildgraph/cycledetector.h>
@@ -52,7 +53,7 @@ void TestBuildGraph::cleanupTestCase()
static bool cycleDetected(const BuildProductConstPtr &product)
{
try {
- CycleDetector().visitProduct(product);
+ CycleDetector(ConsoleLogger::instance()).visitProduct(product);
return false;
} catch (const Error &) {
return true;