Fix problems with time logging.

This is an addendum to 55b848f530e18ae1f8294f05fb1971aa578dd956,
which was erroneously pushed without proper testing.

- Write timing data only if requested.
- Do not access progress observer if it's null.
- Add autotests.

Change-Id: I616dc050e69478d297abb6d5a3ae27a6ccff8503
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

1 files changed, 8 insertions, 0 deletions

diff --git a/tests/auto/cmdlineparser/tst_cmdlineparser.cpp b/tests/auto/cmdlineparser/tst_cmdlineparser.cpp
index af029fce5..2c9c70f62 100644
--- a/tests/auto/cmdlineparser/tst_cmdlineparser.cpp
+++ b/tests/auto/cmdlineparser/tst_cmdlineparser.cpp
@@ -73,11 +73,19 @@ private slots:
         QCOMPARE(parser.buildOptions().changedFiles.count(), 2);
         QVERIFY(parser.buildOptions().keepGoing);
         QVERIFY(parser.force());
+        QVERIFY(!parser.logTime());
 
         QVERIFY(parser.parseCommandLine(QStringList() << "-vvvqqq" << fileArgs, settings.data()));
         QCOMPARE(ConsoleLogger::instance().logSink()->logLevel(), defaultLogLevel());
         QVERIFY(!parser.force());
 
+        QVERIFY(parser.parseCommandLine(QStringList() << "-t" << fileArgs, settings.data()));
+        QVERIFY(parser.logTime());
+
+        QVERIFY(parser.parseCommandLine(QStringList() << "-t" << "--show-progress" << fileArgs,
+                                        settings.data()));
+        QVERIFY(!parser.logTime());
+
         QVERIFY(parser.parseCommandLine(QStringList() << "-vvqqq" << fileArgs, settings.data()));
         QCOMPARE(ConsoleLogger::instance().logSink()->logLevel(), LoggerWarning);