diff options
| author | Richard Weickelt <richard@weickelt.de> | 2020-08-14 11:46:27 +0200 |
|---|---|---|
| committer | Richard Weickelt <richard@weickelt.de> | 2020-08-14 11:46:37 +0200 |
| commit | 2311a8224c3fc7141c44cc517f4ecdb882cd09f8 (patch) | |
| tree | 1d83aed514d564b8e0ccc9934772508926a51882 /tests/auto/blackbox/testdata/path-probe | |
| parent | 0820c2d3ca6ac2e01c1d68945beeba45f4212658 (diff) | |
| parent | e42ad799703412d7375465df49282dd960f81e2e (diff) | |
Merge branch 1.17 into master
Change-Id: Ibdf2afb9f05682e0624540af22330abc8580bafb
Diffstat (limited to 'tests/auto/blackbox/testdata/path-probe')
3 files changed, 12 insertions, 0 deletions
diff --git a/tests/auto/blackbox/testdata/path-probe/BaseApp.qbs b/tests/auto/blackbox/testdata/path-probe/BaseApp.qbs index 46f89cb60..13c69f72f 100644 --- a/tests/auto/blackbox/testdata/path-probe/BaseApp.qbs +++ b/tests/auto/blackbox/testdata/path-probe/BaseApp.qbs @@ -39,6 +39,7 @@ CppApplication { property pathList inputSearchPaths property var inputNameFilter property var inputCandidateFilter + property stringList inputEnvironmentPaths property stringList outputFilePaths property var outputCandidatePaths @@ -52,6 +53,7 @@ CppApplication { candidateFilter: inputCandidateFilter searchPaths: inputSearchPaths platformSearchPaths: [] + environmentPaths: inputEnvironmentPaths } property bool validate: { diff --git a/tests/auto/blackbox/testdata/path-probe/environment-paths.qbs b/tests/auto/blackbox/testdata/path-probe/environment-paths.qbs new file mode 100644 index 000000000..fca824bfb --- /dev/null +++ b/tests/auto/blackbox/testdata/path-probe/environment-paths.qbs @@ -0,0 +1,10 @@ +import qbs.FileInfo + +BaseApp { + inputNames: "tool" + inputSearchPaths: ["bin", "usr/bin"] + // env takes precedence + inputEnvironmentPaths: "SEARCH_PATH" + outputFilePaths: ["usr/bin/tool"] + outputCandidatePaths: [["usr/bin/tool"]] +} diff --git a/tests/auto/blackbox/testdata/path-probe/usr/bin/tool b/tests/auto/blackbox/testdata/path-probe/usr/bin/tool new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/tests/auto/blackbox/testdata/path-probe/usr/bin/tool |