diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-28 07:39:16 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-28 07:39:21 +0200 |
| commit | e2eeee25f8b76b1f7b1c9b69b2417c2f6a4553d6 (patch) | |
| tree | 5ce9bf67ec9bea84b70c7fda930c03c302bc1362 | |
| parent | eb7e5a85ceed419bc93066b32cb8db7012ee8662 (diff) | |
| parent | 5109d990600c1f392fc038a0b9af9630053bf2d6 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
| -rw-r--r-- | tests/auto/integration/integration.pro | 3 | ||||
| -rw-r--r-- | tests/auto/integration/tst_integration.cpp | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/tests/auto/integration/integration.pro b/tests/auto/integration/integration.pro index 6428a97..f304014 100644 --- a/tests/auto/integration/integration.pro +++ b/tests/auto/integration/integration.pro @@ -1,8 +1,5 @@ TARGET = tst_integration -# QTBUG-61552 -boot2qt: DEFINES += SKIP_LOCAL - OTHER_FILES = engine.rep \ ../repfiles/localdatacenter.rep \ ../repfiles/tcpdatacenter.rep diff --git a/tests/auto/integration/tst_integration.cpp b/tests/auto/integration/tst_integration.cpp index 7f39381..0718219 100644 --- a/tests/auto/integration/tst_integration.cpp +++ b/tests/auto/integration/tst_integration.cpp @@ -214,9 +214,7 @@ private slots: #ifdef __QNXNTO__ QTest::newRow("qnx") << QUrl(QLatin1String("qnx:replica")) << QUrl(QLatin1String("qnx:registry")); #endif -#ifndef SKIP_LOCAL - QTest::newRow("local") << QUrl(QLatin1String("local:replica_local_integration")) << QUrl(QLatin1String("local:registry_local_integration")); -#endif + QTest::newRow("local") << QUrl(QLatin1String("local:replicaLocalIntegration")) << QUrl(QLatin1String("local:registryLocalIntegration")); QTest::newRow("external") << QUrl() << QUrl(); } @@ -1299,7 +1297,7 @@ private slots: QVERIFY(invalidRegistry.lastError() == QRemoteObjectNode::RegistryNotAcquired); } -#if defined(Q_OS_LINUX) || defined(Q_OS_DARWIN) && !defined(SKIP_LOCAL) +#if defined(Q_OS_LINUX) || defined(Q_OS_DARWIN) void localServerConnectionTest() { QFETCH_GLOBAL(QUrl, hostUrl); |