aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2018-03-12 16:43:42 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2018-03-13 08:57:56 +0000
commitb0c009774c77b872715b695b01a05ae44600f8f7 (patch)
treeaeb1aa9f2b4ec2c55f5c60aaed43a870655e8bb9
parenta5f2a7820fb7ac011409732a4d462b10ac08edf3 (diff)
Fix symbolLinkMode autotest on macOS
An expected failure was inadvertantly "fixed" by a5f2a7820f. Disable the run environment setup for this autotest. Change-Id: I34032ae0bdf51e6bc80ac1902df1ab8e31ed1464 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
-rw-r--r--tests/auto/blackbox/tst_blackbox.cpp19
1 files changed, 7 insertions, 12 deletions
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index d565e7696..0dad55843 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -3684,34 +3684,29 @@ void TestBlackbox::symbolLinkMode()
QDir::setCurrent(testDataDir + "/symbolLinkMode");
QbsRunParameters params;
+ params.command = "run";
+ const QStringList commonArgs{"-p", "driver", "--setup-run-env-config",
+ "ignore-lib-dependencies"};
rmDirR(relativeBuildDir());
- params.command = "run";
- params.arguments = QStringList() << "-p" << "driver"
- << "project.shouldInstallLibrary:true";
+ params.arguments = QStringList() << commonArgs << "project.shouldInstallLibrary:true";
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("somefunction existed and it returned 42"),
m_qbsStdout.constData());
rmDirR(relativeBuildDir());
- params.command = "run";
- params.arguments = QStringList() << "-p" << "driver"
- << "project.shouldInstallLibrary:false";
+ params.arguments = QStringList() << commonArgs << "project.shouldInstallLibrary:false";
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("somefunction did not exist"), m_qbsStdout.constData());
rmDirR(relativeBuildDir());
- params.command = "run";
- params.arguments = QStringList() << "-p" << "driver"
- << "project.lazy:false";
+ params.arguments = QStringList() << commonArgs << "project.lazy:false";
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("Lib was loaded!\nmeow\n"), m_qbsStdout.constData());
if (HostOsInfo::isMacosHost()) {
rmDirR(relativeBuildDir());
- params.command = "run";
- params.arguments = QStringList() << "-p" << "driver"
- << "project.lazy:true";
+ params.arguments = QStringList() << commonArgs << "project.lazy:true";
QCOMPARE(runQbs(params), 0);
QVERIFY2(m_qbsStdout.contains("meow\nLib was loaded!\n"), m_qbsStdout.constData());
}