diff options
| author | Robert Griebl <robert.griebl@qt.io> | 2024-02-15 16:50:40 +0100 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@qt.io> | 2024-02-18 21:02:50 +0000 |
| commit | d565c76092c43fe210e5e88e1ec1cea84ca8cb65 (patch) | |
| tree | c00107edbe902a270a8f11d0d0518248dbb74f46 | |
| parent | 007c0f87069ea81d4a76591a2b85c4772ddf6d3d (diff) | |
auto-tests: Fix controller test
This (a) adapts to the latests instance-suffix changes and (b) tries to
run an dev-build controller binary before using the installed one.
Change-Id: Ib77708b948184c154519aa7c73df268b17a65c59
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
(cherry picked from commit 445ce0fd349375a88777cfd62f356360c898190c)
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
| -rw-r--r-- | tests/auto/controller-tool/tst_controller-tool.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/controller-tool/tst_controller-tool.cpp b/tests/auto/controller-tool/tst_controller-tool.cpp index 4dd553e7..45cece4f 100644 --- a/tests/auto/controller-tool/tst_controller-tool.cpp +++ b/tests/auto/controller-tool/tst_controller-tool.cpp @@ -177,8 +177,8 @@ void tst_ControllerTool::initTestCase() m_main = new Main(m_argc, m_argv); // QCoreApplication saves a reference to argc! QStringList possibleLocations; - possibleLocations.append(QLibraryInfo::path(QLibraryInfo::BinariesPath)); possibleLocations.append(QCoreApplication::applicationDirPath() + u"/../../../bin"_s); + possibleLocations.append(QLibraryInfo::path(QLibraryInfo::BinariesPath)); QString controllerPath; const QString controllerName = u"/appman-controller"_s; @@ -246,7 +246,7 @@ void tst_ControllerTool::instances() { ControllerTool ctrl({ u"list-instances"_s }); QVERIFY2(ctrl.call(), ctrl.failure); - QCOMPARE(ctrl.stdOutList, QStringList({ u"\"controller-test-id\""_s })); + QCOMPARE(ctrl.stdOutList, QStringList({ u"controller-test-id-0"_s })); } void tst_ControllerTool::applications() |