diff options
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/language/tst_language.cpp | 10 | ||||
| -rw-r--r-- | tests/auto/tools/tst_tools.cpp | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/tests/auto/language/tst_language.cpp b/tests/auto/language/tst_language.cpp index c1c7e5add..5d545e466 100644 --- a/tests/auto/language/tst_language.cpp +++ b/tests/auto/language/tst_language.cpp @@ -78,7 +78,7 @@ void TestLanguage::conditionalDepends() ResolvedModule::ConstPtr dependency; try { ProjectFile::Ptr projectFile = loader->loadProject(SRCDIR "testdata/conditionaldepends.qbs"); - ResolvedProject::Ptr project = loader->resolveProject(projectFile, "someBuildDirectory", + ResolvedProject::Ptr project = loader->resolveProject(projectFile, "/some/build/directory", buildConfig); QVERIFY(project); QHash<QString, ResolvedProduct::Ptr> products = productsFromProject(project); @@ -148,7 +148,7 @@ void TestLanguage::groupName() bool exceptionCaught = false; try { ProjectFile::Ptr projectFile = loader->loadProject(SRCDIR "testdata/groupname.qbs"); - ResolvedProject::Ptr project = loader->resolveProject(projectFile, "someBuildDirectory", + ResolvedProject::Ptr project = loader->resolveProject(projectFile, "/some/build/directory", buildConfig); QVERIFY(project); QHash<QString, ResolvedProduct::Ptr> products = productsFromProject(project); @@ -189,7 +189,7 @@ void TestLanguage::productConditions() bool exceptionCaught = false; try { ProjectFile::Ptr projectFile = loader->loadProject(SRCDIR "testdata/productconditions.qbs"); - ResolvedProject::Ptr project = loader->resolveProject(projectFile, "someBuildDirectory", + ResolvedProject::Ptr project = loader->resolveProject(projectFile, "/some/build/directory", buildConfig); QVERIFY(project); QHash<QString, ResolvedProduct::Ptr> products = productsFromProject(project); @@ -230,7 +230,7 @@ void TestLanguage::propertiesBlocks() bool exceptionCaught = false; try { ProjectFile::Ptr projectFile = loader->loadProject(SRCDIR "testdata/propertiesblocks.qbs"); - project = loader->resolveProject(projectFile, "someBuildDirectory", buildConfig); + project = loader->resolveProject(projectFile, "/some/build/directory", buildConfig); QVERIFY(project); } catch (const Error &e) { exceptionCaught = true; @@ -277,7 +277,7 @@ void TestLanguage::fileTags() bool exceptionCaught = false; try { ProjectFile::Ptr projectFile = loader->loadProject(SRCDIR "testdata/filetags.qbs"); - project = loader->resolveProject(projectFile, "someBuildDirectory", buildConfig); + project = loader->resolveProject(projectFile, "/some/build/directory", buildConfig); QVERIFY(project); } catch (const Error &e) { 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() |