Disabled some autotests that fail on S^3.

3 files changed, 37 insertions, 30 deletions

diff --git a/tests/auto/qdeclarativelandmark/tst_qdeclarativelandmark.cpp b/tests/auto/qdeclarativelandmark/tst_qdeclarativelandmark.cpp
index 9d556dc136..237e6fa218 100644
--- a/tests/auto/qdeclarativelandmark/tst_qdeclarativelandmark.cpp
+++ b/tests/auto/qdeclarativelandmark/tst_qdeclarativelandmark.cpp
@@ -1005,6 +1005,10 @@ void tst_QDeclarativeLandmark::update_data()
 
 void tst_QDeclarativeLandmark::databaseChanges()
 {
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Test-case timing instability, skipping test step.", SkipAll);
+#endif
+
     int originalCategoryCount = m_manager->categoryIds().count();
 
     // Test adding and removing of categories
diff --git a/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp b/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp
index fc8aac0b56..c3027d1321 100644
--- a/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp
+++ b/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp
@@ -381,6 +381,9 @@ void TestQGeoPositionInfoSource::lastKnownPosition()
     QFETCH(bool, lastKnownPositionArgument);
     QFETCH(bool, positionValid);
 
+#if defined(Q_OS_SYMBIAN)
+    QSKIP("Real GPS not suitable for autotesting, skipping the test.", SkipAll);
+#endif
     QGeoPositionInfoSource::PositioningMethods method
             = static_cast<QGeoPositionInfoSource::PositioningMethods>(positioningMethod);
 
@@ -480,7 +483,7 @@ void TestQGeoPositionInfoSource::minimumUpdateInterval()
 void TestQGeoPositionInfoSource::startUpdates_testIntervals()
 {
     CHECK_SOURCE_VALID;
-#if defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
     QSKIP("Real GPS not suitable for autotesting, skipping the test.", SkipAll);
 #endif
     QSignalSpy spy(m_source, SIGNAL(positionUpdated(const QGeoPositionInfo&)));
@@ -514,7 +517,7 @@ void TestQGeoPositionInfoSource::startUpdates_testIntervalChangesWhileRunning()
     // this test are as high as they are.
 
     CHECK_SOURCE_VALID;
-#if defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
     QSKIP("Real GPS not suitable for autotesting, skipping the test.", SkipAll);
 #endif
 
@@ -573,7 +576,7 @@ void TestQGeoPositionInfoSource::startUpdates_testIntervalChangesWhileRunning()
 void TestQGeoPositionInfoSource::startUpdates_testDefaultInterval()
 {
     CHECK_SOURCE_VALID;
-#if defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
     QSKIP("Real GPS not suitable for autotesting, skipping the test.", SkipAll);
 #endif
 
@@ -593,7 +596,7 @@ void TestQGeoPositionInfoSource::startUpdates_testDefaultInterval()
 void TestQGeoPositionInfoSource::startUpdates_testZeroInterval()
 {
     CHECK_SOURCE_VALID;
-#if defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
     QSKIP("Real GPS not suitable for autotesting, skipping the test.", SkipAll);
 #endif
 
@@ -613,7 +616,7 @@ void TestQGeoPositionInfoSource::startUpdates_testZeroInterval()
 void TestQGeoPositionInfoSource::startUpdates_moreThanOnce()
 {
     CHECK_SOURCE_VALID;
-#if defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
     QSKIP("Real GPS not suitable for autotesting, skipping the test.", SkipAll);
 #endif
 
@@ -637,7 +640,7 @@ void TestQGeoPositionInfoSource::startUpdates_moreThanOnce()
 void TestQGeoPositionInfoSource::stopUpdates()
 {
     CHECK_SOURCE_VALID;
-#if defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
     QSKIP("Real GPS not suitable for autotesting, skipping the test.", SkipAll);
 #endif
 
@@ -672,7 +675,7 @@ void TestQGeoPositionInfoSource::stopUpdates_withoutStart()
 void TestQGeoPositionInfoSource::requestUpdate()
 {
     CHECK_SOURCE_VALID;
-#if defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
     QSKIP("Real GPS not suitable for autotesting, skipping the test.", SkipAll);
 #endif
     QFETCH(int, timeout);
@@ -691,7 +694,7 @@ void TestQGeoPositionInfoSource::requestUpdate_data()
 void TestQGeoPositionInfoSource::requestUpdate_validTimeout()
 {
     CHECK_SOURCE_VALID;
-#if defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
     QSKIP("Real GPS not suitable for autotesting, skipping the test.", SkipAll);
 #endif
 
@@ -708,7 +711,7 @@ void TestQGeoPositionInfoSource::requestUpdate_validTimeout()
 void TestQGeoPositionInfoSource::requestUpdate_defaultTimeout()
 {
     CHECK_SOURCE_VALID;
-#if defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
     QSKIP("Real GPS not suitable for autotesting, skipping the test.", SkipAll);
 #endif
 
@@ -741,7 +744,7 @@ void TestQGeoPositionInfoSource::requestUpdate_timeoutLessThanMinimumInterval()
 void TestQGeoPositionInfoSource::requestUpdate_repeatedCalls()
 {
     CHECK_SOURCE_VALID;
-#if defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
     QSKIP("Real GPS not suitable for autotesting, skipping the test.", SkipAll);
 #endif
 
@@ -764,7 +767,7 @@ void TestQGeoPositionInfoSource::requestUpdate_repeatedCalls()
 void TestQGeoPositionInfoSource::requestUpdate_overlappingCalls()
 {
     CHECK_SOURCE_VALID;
-#if defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
     QSKIP("Real GPS not suitable for autotesting, skipping the test.", SkipAll);
 #endif
 
@@ -783,7 +786,7 @@ void TestQGeoPositionInfoSource::requestUpdate_overlappingCalls()
 void TestQGeoPositionInfoSource::requestUpdateAfterStartUpdates_ZeroInterval()
 {
     CHECK_SOURCE_VALID;
-#if defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
     QSKIP("Real GPS not suitable for autotesting, skipping the test.", SkipAll);
 #endif
 
@@ -816,7 +819,7 @@ void TestQGeoPositionInfoSource::requestUpdateAfterStartUpdates_ZeroInterval()
 void TestQGeoPositionInfoSource::requestUpdateAfterStartUpdates_SmallInterval()
 {
     CHECK_SOURCE_VALID;
-#if defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
     QSKIP("Real GPS not suitable for autotesting, skipping the test.", SkipAll);
 #endif
 
@@ -848,7 +851,7 @@ void TestQGeoPositionInfoSource::requestUpdateAfterStartUpdates_SmallInterval()
 void TestQGeoPositionInfoSource::requestUpdateBeforeStartUpdates_ZeroInterval()
 {
     CHECK_SOURCE_VALID;
-#if defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
     QSKIP("Real GPS not suitable for autotesting, skipping the test.", SkipAll);
 #endif
 
@@ -877,7 +880,7 @@ void TestQGeoPositionInfoSource::requestUpdateBeforeStartUpdates_ZeroInterval()
 void TestQGeoPositionInfoSource::requestUpdateBeforeStartUpdates_SmallInterval()
 {
     CHECK_SOURCE_VALID;
-#if defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
     QSKIP("Real GPS not suitable for autotesting, skipping the test.", SkipAll);
 #endif
     QSignalSpy spyUpdate(m_source, SIGNAL(positionUpdated(const QGeoPositionInfo&)));
@@ -921,7 +924,7 @@ void TestQGeoPositionInfoSource::removeSlotForRequestTimeout()
 void TestQGeoPositionInfoSource::removeSlotForPositionUpdated()
 {
     CHECK_SOURCE_VALID;
-#if defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
     QSKIP("Real GPS not suitable for autotesting, skipping the test.", SkipAll);
 #endif
 
diff --git a/tests/auto/qgeosatelliteinfosource/testqgeosatelliteinfosource.cpp b/tests/auto/qgeosatelliteinfosource/testqgeosatelliteinfosource.cpp
index 343a0b0730..0248c0ed56 100644
--- a/tests/auto/qgeosatelliteinfosource/testqgeosatelliteinfosource.cpp
+++ b/tests/auto/qgeosatelliteinfosource/testqgeosatelliteinfosource.cpp
@@ -512,7 +512,7 @@ void TestQGeoSatelliteInfoSource::startUpdates()
 {
 
     CHECK_SOURCE_VALID;
-#if defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
     QSKIP("Real GPS not suitable for autotesting, skipping the test.", SkipAll);
 #endif
     QSignalSpy spyView(m_source,
@@ -537,7 +537,7 @@ void TestQGeoSatelliteInfoSource::startUpdates()
 void TestQGeoSatelliteInfoSource::startUpdates_moreThanOnce()
 {
     CHECK_SOURCE_VALID;
-#if defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
     QSKIP("Real GPS not suitable for autotesting, skipping the test.", SkipAll);
 #endif
     QSignalSpy spyView(m_source,
@@ -562,7 +562,7 @@ void TestQGeoSatelliteInfoSource::stopUpdates()
 {
 
     CHECK_SOURCE_VALID;
-#if defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
     QSKIP("Real GPS not suitable for autotesting, skipping the test.", SkipAll);
 #endif
 
@@ -597,7 +597,7 @@ void TestQGeoSatelliteInfoSource::stopUpdates_withoutStart()
 void TestQGeoSatelliteInfoSource::requestUpdate()
 {
     CHECK_SOURCE_VALID;
-#if defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
     QSKIP("Real GPS not suitable for autotesting, skipping the test.", SkipAll);
 #endif
 
@@ -620,7 +620,7 @@ void TestQGeoSatelliteInfoSource::requestUpdate_data()
 void TestQGeoSatelliteInfoSource::requestUpdate_validTimeout()
 {
     CHECK_SOURCE_VALID;
-#if defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
     QSKIP("Real GPS not suitable for autotesting, skipping the test.", SkipAll);
 #endif
 
@@ -641,7 +641,7 @@ void TestQGeoSatelliteInfoSource::requestUpdate_validTimeout()
 void TestQGeoSatelliteInfoSource::requestUpdate_defaultTimeout()
 {
     CHECK_SOURCE_VALID;
-#if defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
     QSKIP("Real GPS not suitable for autotesting, skipping the test.", SkipAll);
 #endif
 
@@ -663,7 +663,7 @@ void TestQGeoSatelliteInfoSource::requestUpdate_defaultTimeout()
 void TestQGeoSatelliteInfoSource::requestUpdate_repeatedCalls()
 {
     CHECK_SOURCE_VALID;
-#if defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
     QSKIP("Real GPS not suitable for autotesting, skipping the test.", SkipAll);
 #endif
 
@@ -690,7 +690,7 @@ void TestQGeoSatelliteInfoSource::requestUpdate_repeatedCalls()
 void TestQGeoSatelliteInfoSource::requestUpdate_overlappingCalls()
 {
     CHECK_SOURCE_VALID;
-#if defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
     QSKIP("Real GPS not suitable for autotesting, skipping the test.", SkipAll);
 #endif
 
@@ -716,7 +716,7 @@ void TestQGeoSatelliteInfoSource::requestUpdate_overlappingCalls()
 void TestQGeoSatelliteInfoSource::requestUpdate_overlappingCallsWithTimeout()
 {
     CHECK_SOURCE_VALID;
-#if defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
     QSKIP("Real GPS not suitable for autotesting, skipping the test.", SkipAll);
 #endif
 
@@ -746,7 +746,7 @@ void TestQGeoSatelliteInfoSource::requestUpdate_overlappingCallsWithTimeout()
 void TestQGeoSatelliteInfoSource::requestUpdateAfterStartUpdates()
 {
     CHECK_SOURCE_VALID;
-#if defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
     QSKIP("Real GPS not suitable for autotesting, skipping the test.", SkipAll);
 #endif
 
@@ -784,7 +784,7 @@ void TestQGeoSatelliteInfoSource::requestUpdateAfterStartUpdates()
 void TestQGeoSatelliteInfoSource::requestUpdateBeforeStartUpdates()
 {
     CHECK_SOURCE_VALID;
-#if defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
     QSKIP("Real GPS not suitable for autotesting, skipping the test.", SkipAll);
 #endif
 
@@ -816,7 +816,7 @@ void TestQGeoSatelliteInfoSource::requestUpdateBeforeStartUpdates()
 void TestQGeoSatelliteInfoSource::removeSlotForRequestTimeout()
 {
     CHECK_SOURCE_VALID;
-#if defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
     QSKIP("Real GPS not suitable for autotesting, skipping the test.", SkipAll);
 #endif
 
@@ -834,7 +834,7 @@ void TestQGeoSatelliteInfoSource::removeSlotForRequestTimeout()
 void TestQGeoSatelliteInfoSource::removeSlotForSatellitesInUseUpdated()
 {
     CHECK_SOURCE_VALID;
-#if defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
     QSKIP("Real GPS not suitable for autotesting, skipping the test.", SkipAll);
 #endif
 
@@ -855,7 +855,7 @@ void TestQGeoSatelliteInfoSource::removeSlotForSatellitesInUseUpdated()
 void TestQGeoSatelliteInfoSource::removeSlotForSatellitesInViewUpdated()
 {
     CHECK_SOURCE_VALID;
-#if defined(Q_WS_MAEMO_6)
+#if defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
     QSKIP("Real GPS not suitable for autotesting, skipping the test.", SkipAll);
 #endif