From 70206df40307cb8b09306638966a19ca03313cf8 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Fri, 16 Feb 2018 10:33:23 -0800 Subject: Run autotests using the qbs from the install root if available ...as opposed to relying on the qbs binary existing in the same directory as the test binaries and being usable from that location. This is necessary for some generators (as they generate projects which call the same qbs binary as they were generated with) where an invocation on the qbs binary in the non-installed location may fail to find dependent libraries when invoked from an outside environment. Change-Id: I4d35a6f70df3ad4c48b202f73399ffe1704f78ca Reviewed-by: Christian Kandeler Reviewed-by: Jake Petroules --- qbs-resources/imports/QbsAutotest.qbs | 3 +++ 1 file changed, 3 insertions(+) (limited to 'qbs-resources') diff --git a/qbs-resources/imports/QbsAutotest.qbs b/qbs-resources/imports/QbsAutotest.qbs index 25720354e..307bfe836 100644 --- a/qbs-resources/imports/QbsAutotest.qbs +++ b/qbs-resources/imports/QbsAutotest.qbs @@ -30,4 +30,7 @@ QtApplication { ] } cpp.rpaths: [FileInfo.joinPaths(qbs.installRoot, qbs.installPrefix, qbsbuildconfig.libDirName)] + qbs.commonRunEnvironment: ({ + "QBS_INSTALL_ROOT": qbs.installRoot + }) } -- cgit v1.2.3