diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2018-02-16 17:12:26 +0100 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-02-16 20:12:03 +0000 |
commit | 537ed71934b79948bd09ad6f55545436b1ba295e (patch) | |
tree | 46884eb9db92163f15ab00708acde304d771e4d4 /tests/auto/blackbox/testdata/whole-archive | |
parent | f04bf5d3cc59ff859d5135fdb5048245ae99b91d (diff) |
Fix wholeArchive() autotest
The test relied on certain output from the linker rule's prepare script.
However, because of our improved change tracking, the prepare script is
no longer executed in all test iterations.
Instead, we now let a probe in the test project provide the necessary
information.
Change-Id: I1dc9c7b24b5f12840f6ef8797f13b722b3851ca1
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'tests/auto/blackbox/testdata/whole-archive')
-rw-r--r-- | tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs b/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs index 15093b401..082adba57 100644 --- a/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs +++ b/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs @@ -1,4 +1,5 @@ import qbs +import qbs.Utilities Project { StaticLibrary { @@ -26,6 +27,20 @@ Project { name: "dynamiclib" property string linkWholeArchive Depends { name: "cpp" } + Probe { + id: dummy + property string toolchainType: qbs.toolchainType + property string compilerVersion: cpp.compilerVersion + property string dummy: product.linkWholeArchive // To force probe re-execution + configure: { + if (toolchainType !== "msvc" + || Utilities.versionCompare(compilerVersion, "19.0.25123") >= 0) { + console.info("can link whole archives"); + } else { + console.info("cannot link whole archives"); + } + } + } Depends { name: "staticlib 1"; cpp.linkWholeArchive: product.linkWholeArchive } Depends { name: "staticlib2"; cpp.linkWholeArchive: product.linkWholeArchive } Depends { name: "staticlib3" } |