diff options
Diffstat (limited to 'tests/auto/blackbox/tst_blackbox.cpp')
| -rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 20d85d543..fde8c61f4 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -6226,9 +6226,9 @@ void TestBlackbox::qbsModuleProvidersCompatibility_data() void TestBlackbox::qbspkgconfigModuleProvider() { QDir::setCurrent(testDataDir + "/qbspkgconfig-module-provider/libs"); + rmDirR(relativeBuildDir()); const auto commonParams = QbsRunParameters(QStringLiteral("install"), { - QStringLiteral("qbs.installPrefix:/usr/local"), QStringLiteral("--install-root"), QStringLiteral("install-root") }); @@ -6237,11 +6237,12 @@ void TestBlackbox::qbspkgconfigModuleProvider() QCOMPARE(runQbs(dynamicParams), 0); QDir::setCurrent(testDataDir + "/qbspkgconfig-module-provider"); + rmDirR(relativeBuildDir()); + + const auto sysroot = testDataDir + "/qbspkgconfig-module-provider/libs/install-root"; QbsRunParameters params; - params.arguments - << "moduleProviders.qbspkgconfig.libDirs:libdir" - << "moduleProviders.qbspkgconfig.sysroot:" + QDir::currentPath() + "/libs/install-root"; + params.arguments << "moduleProviders.qbspkgconfig.sysroot:" + sysroot; QCOMPARE(runQbs(params), 0); } |