aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/tools/tst_tools.cpp
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2012-10-22 16:26:16 +0200
committerChristian Kandeler <christian.kandeler@digia.com>2012-10-23 12:30:35 +0200
commit1d067c0957c56b5926931132cf43853e57a7361e (patch)
treefc09bdd043092785bdd9e4470134808ebc07a336 /tests/auto/tools/tst_tools.cpp
parentd88d876315dc325d99a92d4cce4dc99cf0d76101 (diff)
fix handling of source file paths that contain "../"
Task-number: QBS-139 Change-Id: I8c0e9f0574859c26abe7ead2e64aa0ecd4bfa3ec Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'tests/auto/tools/tst_tools.cpp')
-rw-r--r--tests/auto/tools/tst_tools.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/tools/tst_tools.cpp b/tests/auto/tools/tst_tools.cpp
index e4758ad34..827ae5a9e 100644
--- a/tests/auto/tools/tst_tools.cpp
+++ b/tests/auto/tools/tst_tools.cpp
@@ -88,6 +88,9 @@ private slots:
QVERIFY(qbs::FileInfo::isAbsolute("C:\\bla\\lol"));
#endif
QCOMPARE(qbs::FileInfo::resolvePath("/abc/lol", "waffl"), QString("/abc/lol/waffl"));
+ QCOMPARE(qbs::FileInfo::resolvePath("/abc/def/ghi/jkl/", "../foo/bar"), QString("/abc/def/ghi/foo/bar"));
+ QCOMPARE(qbs::FileInfo::resolvePath("/abc/def/ghi/jkl/", "../../foo/bar"), QString("/abc/def/foo/bar"));
+ QCOMPARE(qbs::FileInfo::resolvePath("/abc", "../../../foo/bar"), QString("/foo/bar"));
}
void testProjectFileLookup()