diff --git a/qbs/imports/cutehmi/Test.qbs b/qbs/imports/cutehmi/Test.qbs index 5fbfcbba..b02c7156 100644 --- a/qbs/imports/cutehmi/Test.qbs +++ b/qbs/imports/cutehmi/Test.qbs @@ -1,70 +1,70 @@ import qbs import "CommonProduct.qbs" as CommonProduct /** Test product. */ CommonProduct { type: ["application", "autotest"] name: testNamePrefix + "." + testName cutehmiType: "test" baseName: name // // Even tho' 'type' property can conditionaly specify "autotest", when condition involves complex evaluation of module // parameters such as 'cutehmi.product.enabled' (probably causing some re-evaluation) AutotestRunner will not conform to the // final results, but rather stick to some initial results (branch that specifies "autotest"). Using 'condition' seems to // resolve the issue. No product should depend on a test product, so no product should be affected by // "qbs-imports-cutehmi-1.workaround". condition: project.buildTests && cutehmi.product.enabled // property string testName property string testNamePrefix Depends { name: "cpp" } Properties { condition: qbs.targetOS.contains("linux") cpp.linkerFlags: "-rpath=$ORIGIN" } cpp.defines: base.concat("QUICK_TEST_SOURCE_DIR=\"" + sourceDirectory + "\"") cpp.includePaths: [cutehmi.dirs.externalIncludeDir] cpp.libraryPaths: [cutehmi.dirs.externalLibDir] Depends { name: "Qt.testlib" } Depends { name: "Qt.qmltest" } Depends { name: "cutehmi.cpp" } Depends { name: "cutehmi.dirs" } Depends { name: "autotest" } - autotest.arguments: ["-o", "test.xml,xunitxml"] + autotest.arguments: ["-o", name + ".xunit.xml,xunitxml"] Group { name: "Application" fileTagsFilter: "application" qbs.install: true qbs.installDir: cutehmi.dirs.testsInstallSubdir } Group { name: "Translations" fileTagsFilter: ["qm"] qbs.install: true qbs.installDir: cutehmi.dirs.translationsInstallSubdir } } //(c)C: Copyright © 2018-2020, Michał Policht . All rights reserved. //(c)C: This file is a part of CuteHMI. //(c)C: CuteHMI is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. //(c)C: CuteHMI is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. //(c)C: You should have received a copy of the GNU Lesser General Public License along with CuteHMI. If not, see .