diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2012-10-22 16:26:16 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2012-10-23 12:30:35 +0200 |
| commit | 1d067c0957c56b5926931132cf43853e57a7361e (patch) | |
| tree | fc09bdd043092785bdd9e4470134808ebc07a336 /tests/auto/language | |
| parent | d88d876315dc325d99a92d4cce4dc99cf0d76101 (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/language')
| -rw-r--r-- | tests/auto/language/tst_language.cpp | 10 |
1 files changed, 5 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) { |