Moved sql autotests into new directory structure

Task-number: QTBUG-21253 Change-Id: Id20605e1247b080e775968b56ea5f56462ca4c71 Reviewed-on: http://codereview.qt.nokia.com/4127 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
2011-09-02 12:08:47 +02:00 · 2011-09-02 12:08:47 +02:00 · 0a2282f97a
commit 0a2282f97a
parent 5e9f410eb6
39 changed files with 26 additions and 18 deletions
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@ -4,7 +4,7 @@ SUBDIRS += \
    corelib.pro \
    gui.pro \
    network.pro \
-    sql.pro \
+    sql \
    xml.pro \
    other.pro
--- a/tests/auto/sql.pro
+++ b/tests/auto/sql.pro
@ -1,14 +0,0 @@
 TEMPLATE=subdirs
 SUBDIRS=\
    qsql \
    qsqldatabase \
    qsqldriver \
    qsqlerror \
    qsqlfield \
    qsqlquery \
    qsqlquerymodel \
    qsqlrecord \
    qsqlrelationaltablemodel \
    qsqltablemodel \
    qsqlthread \
--- a/tests/auto/sql/kernel/kernel.pro
+++ b/tests/auto/sql/kernel/kernel.pro
@ -0,0 +1,11 @@
 TEMPLATE=subdirs
 SUBDIRS=\
   qsqlfield \
   qsqldatabase \
   qsqlerror \
   qsqldriver \
   qsqlquery \
   qsqlrecord \
   qsqlthread \
   qsql \
--- a/tests/auto/sql/kernel/qsql/.gitignore
+++ b/tests/auto/sql/kernel/qsql/.gitignore
--- a/tests/auto/sql/kernel/qsql/qsql.pro
+++ b/tests/auto/sql/kernel/qsql/qsql.pro
--- a/tests/auto/sql/kernel/qsql/tst_qsql.cpp
+++ b/tests/auto/sql/kernel/qsql/tst_qsql.cpp
--- a/tests/auto/sql/kernel/qsqldatabase/.gitignore
+++ b/tests/auto/sql/kernel/qsqldatabase/.gitignore
--- a/tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro
+++ b/tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro
--- a/tests/auto/sql/kernel/qsqldatabase/testdata/qtest.mdb
+++ b/tests/auto/sql/kernel/qsqldatabase/testdata/qtest.mdb
--- a/tests/auto/sql/kernel/qsqldatabase/tst_databases.h
+++ b/tests/auto/sql/kernel/qsqldatabase/tst_databases.h
--- a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
+++ b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
--- a/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro
+++ b/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro
--- a/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp
+++ b/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp
--- a/tests/auto/sql/kernel/qsqlerror/.gitignore
+++ b/tests/auto/sql/kernel/qsqlerror/.gitignore
--- a/tests/auto/sql/kernel/qsqlerror/qsqlerror.pro
+++ b/tests/auto/sql/kernel/qsqlerror/qsqlerror.pro
--- a/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp
+++ b/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp
--- a/tests/auto/sql/kernel/qsqlfield/.gitignore
+++ b/tests/auto/sql/kernel/qsqlfield/.gitignore
--- a/tests/auto/sql/kernel/qsqlfield/qsqlfield.pro
+++ b/tests/auto/sql/kernel/qsqlfield/qsqlfield.pro
--- a/tests/auto/sql/kernel/qsqlfield/tst_qsqlfield.cpp
+++ b/tests/auto/sql/kernel/qsqlfield/tst_qsqlfield.cpp
--- a/tests/auto/sql/kernel/qsqlquery/.gitignore
+++ b/tests/auto/sql/kernel/qsqlquery/.gitignore
--- a/tests/auto/sql/kernel/qsqlquery/qsqlquery.pro
+++ b/tests/auto/sql/kernel/qsqlquery/qsqlquery.pro
--- a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
+++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
--- a/tests/auto/sql/kernel/qsqlrecord/.gitignore
+++ b/tests/auto/sql/kernel/qsqlrecord/.gitignore
--- a/tests/auto/sql/kernel/qsqlrecord/qsqlrecord.pro
+++ b/tests/auto/sql/kernel/qsqlrecord/qsqlrecord.pro
--- a/tests/auto/sql/kernel/qsqlrecord/tst_qsqlrecord.cpp
+++ b/tests/auto/sql/kernel/qsqlrecord/tst_qsqlrecord.cpp
--- a/tests/auto/sql/kernel/qsqlthread/.gitignore
+++ b/tests/auto/sql/kernel/qsqlthread/.gitignore
--- a/tests/auto/sql/kernel/qsqlthread/qsqlthread.pro
+++ b/tests/auto/sql/kernel/qsqlthread/qsqlthread.pro
--- a/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp
+++ b/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp
--- a/tests/auto/sql/models/models.pro
+++ b/tests/auto/sql/models/models.pro
@ -0,0 +1,6 @@
 TEMPLATE=subdirs
 SUBDIRS=\
   qsqlquerymodel \
   qsqlrelationaltablemodel \
   qsqltablemodel \
--- a/tests/auto/sql/models/qsqlquerymodel/.gitignore
+++ b/tests/auto/sql/models/qsqlquerymodel/.gitignore
--- a/tests/auto/sql/models/qsqlquerymodel/qsqlquerymodel.pro
+++ b/tests/auto/sql/models/qsqlquerymodel/qsqlquerymodel.pro
--- a/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp
+++ b/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp
@ -53,7 +53,7 @@
 #include <qsqlquerymodel.h>
 #include <qsortfilterproxymodel.h>
-#include "../qsqldatabase/tst_databases.h"
+#include "../../kernel/qsqldatabase/tst_databases.h"
 //TESTED_CLASS=
 //TESTED_FILES=
--- a/tests/auto/sql/models/qsqlrelationaltablemodel/.gitignore
+++ b/tests/auto/sql/models/qsqlrelationaltablemodel/.gitignore
--- a/tests/auto/sql/models/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
+++ b/tests/auto/sql/models/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
--- a/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
+++ b/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
@ -43,7 +43,7 @@
 #include <QtTest/QtTest>
 #include <QtSql/QtSql>
-#include "../qsqldatabase/tst_databases.h"
+#include "../../kernel/qsqldatabase/tst_databases.h"
 const QString reltest1(qTableName("reltest1", __FILE__)),
        reltest2(qTableName("reltest2", __FILE__)),
--- a/tests/auto/sql/models/qsqltablemodel/.gitignore
+++ b/tests/auto/sql/models/qsqltablemodel/.gitignore
--- a/tests/auto/sql/models/qsqltablemodel/qsqltablemodel.pro
+++ b/tests/auto/sql/models/qsqltablemodel/qsqltablemodel.pro
--- a/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp
+++ b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp
@ -41,7 +41,7 @@
 #include <QtTest/QtTest>
-#include "../qsqldatabase/tst_databases.h"
+#include "../../kernel/qsqldatabase/tst_databases.h"
 #include <QtSql>
 const QString test(qTableName("test", __FILE__)),
--- a/tests/auto/sql/sql.pro
+++ b/tests/auto/sql/sql.pro
@ -0,0 +1,5 @@
 TEMPLATE=subdirs
 SUBDIRS=\
   kernel \
   models \