summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorBill King <bill.king@nokia.com>2009-08-11 13:50:12 +1000
committerBill King <bill.king@nokia.com>2009-08-11 13:54:14 +1000
commitb200e79d5df436f2c881f8a2bc5534ee53e664d5 (patch)
tree91592812919b73c8229c549267d05691cd686020 /tests/auto
parent276ad6012620864d4e9fb4a9cb45bcf904c9fbc3 (diff)
Fixes false fails in interbase autotests.
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp3
-rw-r--r--tests/auto/qsqldatabase/tst_qsqldatabase.cpp4
-rw-r--r--tests/auto/qsqlquery/tst_qsqlquery.cpp2
3 files changed, 9 insertions, 0 deletions
diff --git a/tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp b/tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
index e5a9b012cd..0f30656db9 100644
--- a/tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
+++ b/tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
@@ -524,6 +524,9 @@ void tst_Q3SqlCursor::unicode()
if ( !db.driver()->hasFeature( QSqlDriver::Unicode ) ) {
QSKIP( "DBMS not Unicode capable", SkipSingle );
}
+ // ascii in the data storage, can't transliterate properly. invalid test.
+ if(db.driverName().startsWith("QIBASE") && (db.databaseName() == "silence.nokia.troll.no:c:\\ibase\\testdb_ascii" || db.databaseName() == "/opt/interbase/qttest.gdb"))
+ QSKIP("Can't transliterate extended unicode to ascii", SkipSingle);
Q3SqlCursor cur( qTableName( "qtest_unicode" ), true, db );
QSqlRecord* irec = cur.primeInsert();
diff --git a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
index fe4c86e1a7..83569b4073 100644
--- a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
+++ b/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
@@ -2274,6 +2274,10 @@ void tst_QSqlDatabase::eventNotificationPSQL()
QSqlDatabase db = QSqlDatabase::database(dbName);
CHECK_DATABASE(db);
+#if defined(Q_OS_LINUX)
+ QSKIP( "Event support doesn't work on linux", SkipAll );
+#endif
+
QSqlQuery query(db);
QString procedureName = qTableName("posteventProc");
diff --git a/tests/auto/qsqlquery/tst_qsqlquery.cpp b/tests/auto/qsqlquery/tst_qsqlquery.cpp
index f3dd92091d..e1823e62e6 100644
--- a/tests/auto/qsqlquery/tst_qsqlquery.cpp
+++ b/tests/auto/qsqlquery/tst_qsqlquery.cpp
@@ -1611,6 +1611,8 @@ void tst_QSqlQuery::prepare_bind_exec()
QFETCH( QString, dbName );
QSqlDatabase db = QSqlDatabase::database( dbName );
CHECK_DATABASE( db );
+ if(db.driverName().startsWith("QIBASE") && (db.databaseName() == "silence.nokia.troll.no:c:\\ibase\\testdb_ascii" || db.databaseName() == "/opt/interbase/qttest.gdb"))
+ QSKIP("Can't transliterate extended unicode to ascii", SkipSingle);
{
// new scope for SQLITE