diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-12-21 08:02:49 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-01-02 12:16:49 +0000 |
| commit | 83c43258e0a8f7e45808ecdf60b49938413c85bf (patch) | |
| tree | f54e28c576604cbb23b41dd15d90a479d16327a8 /tests | |
| parent | 4f34d7e7ed6e9b58e40629045fc662e17c8623eb (diff) | |
Fix FileInfo.canonicalPath blackbox test for non-Unix
The path passed to canonicalPath has to exist.
Change-Id: Ibcc0a142ab5714e6a937c688fd1fd035fdfea9e3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/blackbox/testdata/jsextensions-fileinfo/fileinfo.qbs | 3 | ||||
| -rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/blackbox/testdata/jsextensions-fileinfo/fileinfo.qbs b/tests/auto/blackbox/testdata/jsextensions-fileinfo/fileinfo.qbs index 5d0521c2a..d63ba2962 100644 --- a/tests/auto/blackbox/testdata/jsextensions-fileinfo/fileinfo.qbs +++ b/tests/auto/blackbox/testdata/jsextensions-fileinfo/fileinfo.qbs @@ -3,6 +3,7 @@ import qbs.TextFile Product { type: ["dummy"] + property string messyPath: path + "/../" + FileInfo.fileName(path) Rule { multiplex: true outputFileTags: "dummy" @@ -13,7 +14,7 @@ Product { var output = new TextFile(FileInfo.joinPaths(product.sourceDirectory, "output.txt"), TextFile.WriteOnly); output.writeLine(FileInfo.baseName("/tmp/blubb.tar.gz")); - output.writeLine(FileInfo.canonicalPath("/usr/local//../bin/")); + output.writeLine(FileInfo.canonicalPath(product.messyPath)); output.writeLine(FileInfo.cleanPath("/usr/local//../bin/")); output.writeLine(FileInfo.completeBaseName("/tmp/blubb.tar.gz")); output.writeLine(FileInfo.fileName("/tmp/blubb.tar.gz")); diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 380b5dd80..53cea26e0 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -4018,7 +4018,8 @@ void TestBlackbox::jsExtensionsFileInfo() QCOMPARE(lines.size(), 26); int i = 0; QCOMPARE(lines.at(i++).trimmed().constData(), "blubb"); - QCOMPARE(lines.at(i++).trimmed().constData(), "/usr/bin"); + QCOMPARE(lines.at(i++).trimmed().constData(), qUtf8Printable( + QFileInfo(QDir::currentPath()).canonicalFilePath())); QCOMPARE(lines.at(i++).trimmed().constData(), "/usr/bin"); QCOMPARE(lines.at(i++).trimmed().constData(), "blubb.tar"); QCOMPARE(lines.at(i++).trimmed().constData(), "blubb.tar.gz"); |