diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2012-02-27 22:58:18 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2012-02-27 22:58:18 +1000 |
| commit | 55a688b8d5e8c3c781509e4433dfb6116930e2bf (patch) | |
| tree | eacf129d32981e7a8c50f1c6316d9ef4be243389 /tests | |
| parent | c03a4074ec45d478175fb8331536262cd521c6a6 (diff) | |
| parent | a9744094ea981648b4732dafd12cc3e557e7e2f2 (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-contacts into master-integration
* 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-contacts:
disable only the tst_qmessagestorekeys tests
test commit to check if qtm ci build node is fine again on ubuntu
Fix build break in symbiansim component on Symbian
Fix contacts plugin platform version detection on Symbian
Porting of contactmodel error #958574,#911410,#896532 from SR2 to SR1 (29980)
Enable failing autotests again
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qmessageservice/tst_qmessageservice.cpp | 6 | ||||
| -rw-r--r-- | tests/auto/qmessagestore/tst_qmessagestore.cpp | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/tests/auto/qmessageservice/tst_qmessageservice.cpp b/tests/auto/qmessageservice/tst_qmessageservice.cpp index 6b1e4704b7..20f0192d53 100644 --- a/tests/auto/qmessageservice/tst_qmessageservice.cpp +++ b/tests/auto/qmessageservice/tst_qmessageservice.cpp @@ -173,10 +173,8 @@ private slots: void initTestCase(); void cleanupTestCase(); -/* temporarily disabled to get continuous integration working again void testQueryMessages(); void testQueryMessages_data(); -*/ void testCountMessages(); void testCountMessages_data(); @@ -506,7 +504,6 @@ void tst_QMessageService::cleanupTestCase() { } -/* temporarily disabled to get continuous integration working again void tst_QMessageService::testQueryMessages() { QFETCH(QMessageFilter, filter); @@ -576,7 +573,6 @@ void tst_QMessageService::testQueryMessages() QSKIP("Unsupported for this configuration", SkipSingle); } } -*/ void tst_QMessageService::testQueryCountData() { @@ -2072,12 +2068,10 @@ void tst_QMessageService::testQueryCountData() #endif } -/* temporarily disabled to get continuous integration working again void tst_QMessageService::testQueryMessages_data() { testQueryCountData(); } -*/ void tst_QMessageService::testCountMessages() { diff --git a/tests/auto/qmessagestore/tst_qmessagestore.cpp b/tests/auto/qmessagestore/tst_qmessagestore.cpp index e3fc06a4f4..56c5e35daf 100644 --- a/tests/auto/qmessagestore/tst_qmessagestore.cpp +++ b/tests/auto/qmessagestore/tst_qmessagestore.cpp @@ -162,10 +162,8 @@ private slots: void testRemoveAccount(); -/* temporarily disabled to get continuous integration working again void testMessage_data(); void testMessage(); -*/ private: QMessageManager *manager; @@ -387,7 +385,6 @@ Q_DECLARE_METATYPE(QList<int>) typedef QMap<QString, QString> CustomFieldMap; Q_DECLARE_METATYPE(CustomFieldMap) -/* temporarily disabled to get continuous integration working again void tst_QMessageStore::testMessage_data() { QTest::addColumn<QString>("to"); @@ -550,7 +547,6 @@ void tst_QMessageStore::testMessage_data() << customData << "byFilter"; } -*/ void tst_QMessageStore::testRemoveAccount() { @@ -574,7 +570,6 @@ void tst_QMessageStore::testRemoveAccount() #endif } -/* temporarily disabled to get continuous integration working again void tst_QMessageStore::testMessage() { // Ensure we have an account to create messages with @@ -1042,5 +1037,4 @@ void tst_QMessageStore::testMessage() #endif #endif } -*/ |