summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Sarajärvi <tony.sarajarvi@qt.io>2018-09-11 18:55:47 +0300
committerTony Sarajärvi <tony.sarajarvi@qt.io>2018-09-21 06:29:41 +0000
commit2b57cb94c2de0671f19bb7f864283586a70b3d15 (patch)
tree09ff8a28d70a3fdbbea400759e6fc978a8976d93
parentf151773aa749eadd7adb35fbd8f727238152da4f (diff)
downloadqtlocation-2b57cb94c2de0671f19bb7f864283586a70b3d15.tar.gz
Revert "Mark QNmeaPositionInfoSource tests as insignificant on Windows."
This reverts commit 63c8b3bca03586994c2b59c262e9cb3a9b12b363. With vSphere based VMs moved to KVM based, we can try if the networking issues have been solved. Change-Id: I41fd6845341df5722c1ba2e0cd76e01bf16df4fb Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Liang Qi <liang.qi@qt.io>
-rw-r--r--tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/dummynmeapositioninfosource.pro8
-rw-r--r--tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime/qnmeapositioninfosource_realtime.pro8
-rw-r--r--tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime_generic/qnmeapositioninfosource_realtime_generic.pro8
-rw-r--r--tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation/qnmeapositioninfosource_simulation.pro8
-rw-r--r--tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation_generic/qnmeapositioninfosource_simulation_generic.pro8
5 files changed, 5 insertions, 35 deletions
diff --git a/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/dummynmeapositioninfosource.pro b/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/dummynmeapositioninfosource.pro
index 261992a9..a0bfa1ff 100644
--- a/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/dummynmeapositioninfosource.pro
+++ b/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/dummynmeapositioninfosource.pro
@@ -14,10 +14,4 @@ SOURCES += ../../utils/qlocationtestutils.cpp \
../qnmeapositioninfosourceproxyfactory.cpp \
tst_dummynmeapositioninfosource.cpp
-# This test relies on a working local QTcpSocket(Server). When the CI is under
-# heavy load the socket code cannot establish a connection which leads to flaky
-# test results. We make this test insiginficant as there is currently no known
-# solution to this problem. On the positive side QNmeaPositionInfoSource
-# does not have a platform specific implementation. Other platforms should provide
-# a close enough test approximation.
-win32:CONFIG+=insignificant_test
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime/qnmeapositioninfosource_realtime.pro b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime/qnmeapositioninfosource_realtime.pro
index 2b93cc29..a5f512bd 100644
--- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime/qnmeapositioninfosource_realtime.pro
+++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime/qnmeapositioninfosource_realtime.pro
@@ -16,10 +16,4 @@ SOURCES += ../../utils/qlocationtestutils.cpp \
../tst_qnmeapositioninfosource.cpp \
tst_qnmeapositioninfosource_realtime.cpp
-# This test relies on a working local QTcpSocket(Server). When the CI is under
-# heavy load the socket code cannot establish a connection which leads to flaky
-# test results. We make this test insiginficant as there is currently no known
-# solution to this problem. On the positive side QNmeaPositionInfoSource
-# does not have a platform specific implementation. Other platforms should provide
-# a close enough test approximation.
-win32:CONFIG+=insignificant_test
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime_generic/qnmeapositioninfosource_realtime_generic.pro b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime_generic/qnmeapositioninfosource_realtime_generic.pro
index 068289b1..8c48c684 100644
--- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime_generic/qnmeapositioninfosource_realtime_generic.pro
+++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime_generic/qnmeapositioninfosource_realtime_generic.pro
@@ -19,10 +19,4 @@ SOURCES += ../../utils/qlocationtestutils.cpp \
CONFIG -= app_bundle
-# This test relies on a working local QTcpSocket(Server). When the CI is under
-# heavy load the socket code cannot establish a connection which leads to flaky
-# test results. We make this test insiginficant as there is currently no known
-# solution to this problem. On the positive side QNmeaPositionInfoSource
-# does not have a platform specific implementation. Other platforms should provide
-# a close enough test approximation.
-win32:CONFIG+=insignificant_test
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation/qnmeapositioninfosource_simulation.pro b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation/qnmeapositioninfosource_simulation.pro
index 1214d7ef..1f0861df 100644
--- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation/qnmeapositioninfosource_simulation.pro
+++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation/qnmeapositioninfosource_simulation.pro
@@ -16,10 +16,4 @@ SOURCES += ../../utils/qlocationtestutils.cpp \
../tst_qnmeapositioninfosource.cpp \
tst_qnmeapositioninfosource_simulation.cpp
-# This test relies on a working local QTcpSocket(Server). When the CI is under
-# heavy load the socket code cannot establish a connection which leads to flaky
-# test results. We make this test insiginficant as there is currently no known
-# solution to this problem. On the positive side QNmeaPositionInfoSource
-# does not have a platform specific implementation. Other platforms should provide
-# a close enough test approximation.
-win32:CONFIG+=insignificant_test
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation_generic/qnmeapositioninfosource_simulation_generic.pro b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation_generic/qnmeapositioninfosource_simulation_generic.pro
index 726a746c..8b16d444 100644
--- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation_generic/qnmeapositioninfosource_simulation_generic.pro
+++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation_generic/qnmeapositioninfosource_simulation_generic.pro
@@ -19,10 +19,4 @@ SOURCES += ../../utils/qlocationtestutils.cpp \
CONFIG -= app_bundle
-# This test relies on a working local QTcpSocket(Server). When the CI is under
-# heavy load the socket code cannot establish a connection which leads to flaky
-# test results. We make this test insiginficant as there is currently no known
-# solution to this problem. On the positive side QNmeaPositionInfoSource
-# does not have a platform specific implementation. Other platforms should provide
-# a close enough test approximation.
-win32:CONFIG+=insignificant_test
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0