From c9672f4ffa133e7f7d82e8db851a8666b6a12ce7 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 26 May 2020 11:43:45 +0200 Subject: qbs build: Fix unittest project file There were some subtle errors that lead to test failures. Change-Id: Ibea24a8a45a47a5c3239da77bd4ed7ddca61ec57 Reviewed-by: Nikolai Kosjar --- tests/unit/unittest/unittest.qbs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/unit/unittest/unittest.qbs b/tests/unit/unittest/unittest.qbs index 05bf4f70dc..08721a3f32 100644 --- a/tests/unit/unittest/unittest.qbs +++ b/tests/unit/unittest/unittest.qbs @@ -3,7 +3,7 @@ import qbs.FileInfo CppApplication { condition: gtest.present && gmock.present - type: base.concat("autotest") + type: base.concat(["autotest", "json_copy"]) consoleApplication: true destinationDirectory: FileInfo.joinPaths(project.buildDirectory, FileInfo.relativePath(project.ide_source_tree, sourceDirectory)) @@ -34,8 +34,7 @@ CppApplication { "CLANG_UNIT_TESTS", "UNIT_TESTS", "DONT_CHECK_MESSAGE_COUNTER", - 'QTC_RESOURCE_DIR="' + FileInfo.joinPaths(project.sourceDirectory, "share", "qtcreator") - + '"', + 'QTC_RESOURCE_DIR="' + path + "/../../../share/qtcreator" + '"', 'TESTDATA_DIR="' + FileInfo.joinPaths(sourceDirectory, "data") + '"', 'ECHOSERVER="' + FileInfo.joinPaths(project.buildDirectory, "tests", "unit", "echoserver", "echo") + '"', -- cgit v1.2.1