diff options
author | Ivan Komissarov <abbapoh@gmail.com> | 2020-07-14 21:48:53 +0200 |
---|---|---|
committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-07-16 08:43:08 +0000 |
commit | 6fa78d83517308a193f4a57818acfb51a4da0652 (patch) | |
tree | 8084a833e39c915fc7009e873b553bece8f098b4 /tests | |
parent | 3ae5188b20dca13fb2c23ca09457b9eda2147b4c (diff) |
Probes: Remove nameFilter from FrameworkProbe
It is not possible to use functions as values for properties with the
new JS engine.
Remove nameFilter by allowing to have common nameSuffixes for different
selectors.
Change-Id: I24ae747f4d609c956285e77ee832c6e99304a622
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/blackbox/testdata/path-probe/mult-files-common-suffixes.qbs | 10 | ||||
-rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/tests/auto/blackbox/testdata/path-probe/mult-files-common-suffixes.qbs b/tests/auto/blackbox/testdata/path-probe/mult-files-common-suffixes.qbs new file mode 100644 index 000000000..c4d53a715 --- /dev/null +++ b/tests/auto/blackbox/testdata/path-probe/mult-files-common-suffixes.qbs @@ -0,0 +1,10 @@ +BaseApp { + inputSelectors: [ + {names : "tool"}, + {names : "super-tool"}, + ] + inputNameSuffixes: ".1" + inputSearchPaths: "bin" + outputFilePaths: ["bin/tool.1", "bin/super-tool.1"] + outputCandidatePaths: [["bin/tool.1"], ["bin/super-tool.1"]] +} diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index b0d9c2976..786a43725 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -2931,6 +2931,7 @@ void TestBlackbox::pathProbe_data() QTest::newRow("mult-files-mult-variants") << QString("mult-files-mult-variants.qbs") << true; QTest::newRow("single-file-suffixes") << QString("single-file-suffixes.qbs") << true; QTest::newRow("mult-files-suffixes") << QString("mult-files-suffixes.qbs") << true; + QTest::newRow("mult-files-common-suffixes") << QString("mult-files-common-suffixes.qbs") << true; QTest::newRow("mult-files-mult-suffixes") << QString("mult-files-mult-suffixes.qbs") << true; QTest::newRow("name-filter") << QString("name-filter.qbs") << true; QTest::newRow("candidate-filter") << QString("candidate-filter.qbs") << true; |