diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-03 03:00:43 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-03 03:00:49 +0200 |
| commit | a23672bad7e28cc0b9c573ad6909e15a46390657 (patch) | |
| tree | 069269c02119b21e410e2cb7fb2a97aff3c35f8f /tests/auto/integration/tst_integration.cpp | |
| parent | cd85f82a1be9753c8259abd53914d5eabd6e7c48 (diff) | |
| parent | 2f90e4cfbb80fbbbe4002ab8b15cb866914b0eae (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into dev"
Diffstat (limited to 'tests/auto/integration/tst_integration.cpp')
| -rw-r--r-- | tests/auto/integration/tst_integration.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
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); |