aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/tools
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2017-05-10 11:53:36 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2017-05-10 13:53:59 +0000
commit7c163caf130d221345e367f7596ad49526eed7e9 (patch)
tree51ea0f551106d1668bb7fc6ec0b5b170bba6a2a8 /tests/auto/tools
parent37974243d4215f1e76994175ebc1988292ccc45a (diff)
Support providing a settings directory to the autotests
This allows us to run several instances of an autotest in parallel for the same qbs version. Change-Id: I17652ffeba01679800f30fe73d033f7f10e2ded5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/tools')
-rw-r--r--tests/auto/tools/tst_tools.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/auto/tools/tst_tools.cpp b/tests/auto/tools/tst_tools.cpp
index bd88d01df..88337787e 100644
--- a/tests/auto/tools/tst_tools.cpp
+++ b/tests/auto/tools/tst_tools.cpp
@@ -26,7 +26,8 @@
**
****************************************************************************/
-#include <tools/settings.h>
+
+#include "../shared.h"
#include <tools/tst_tools.h>
#include <QtCore/qcoreapplication.h>
@@ -36,7 +37,7 @@
int main(int argc, char *argv[])
{
QCoreApplication app(argc, argv);
- qbs::Settings settings((QString()));
- qbs::Internal::TestTools tt(&settings);
+ const SettingsPtr s = settings();
+ qbs::Internal::TestTools tt(s.get());
return QTest::qExec(&tt, argc, argv);
}