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>

39 files changed, 26 insertions, 18 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 5fb6757648..955c80eb1b 100644
--- 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
 
diff --git a/tests/auto/sql.pro b/tests/auto/sql.pro
deleted file mode 100644
index 7cfd137ae7..0000000000
--- a/tests/auto/sql.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-TEMPLATE=subdirs
-SUBDIRS=\
-    qsql \
-    qsqldatabase \
-    qsqldriver \
-    qsqlerror \
-    qsqlfield \
-    qsqlquery \
-    qsqlquerymodel \
-    qsqlrecord \
-    qsqlrelationaltablemodel \
-    qsqltablemodel \
-    qsqlthread \
-
diff --git a/tests/auto/sql/kernel/kernel.pro b/tests/auto/sql/kernel/kernel.pro
new file mode 100644
index 0000000000..579c31a01f
--- /dev/null
+++ b/tests/auto/sql/kernel/kernel.pro
@@ -0,0 +1,11 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qsqlfield \
+   qsqldatabase \
+   qsqlerror \
+   qsqldriver \
+   qsqlquery \
+   qsqlrecord \
+   qsqlthread \
+   qsql \
+
diff --git a/tests/auto/qsql/.gitignore b/tests/auto/sql/kernel/qsql/.gitignore
index b1e335be74..b1e335be74 100644
--- a/tests/auto/qsql/.gitignore
+++ b/tests/auto/sql/kernel/qsql/.gitignore
diff --git a/tests/auto/qsql/qsql.pro b/tests/auto/sql/kernel/qsql/qsql.pro
index 3357e762dc..3357e762dc 100644
--- a/tests/auto/qsql/qsql.pro
+++ b/tests/auto/sql/kernel/qsql/qsql.pro
diff --git a/tests/auto/qsql/tst_qsql.cpp b/tests/auto/sql/kernel/qsql/tst_qsql.cpp
index 453eb44daa..453eb44daa 100644
--- a/tests/auto/qsql/tst_qsql.cpp
+++ b/tests/auto/sql/kernel/qsql/tst_qsql.cpp
diff --git a/tests/auto/qsqldatabase/.gitignore b/tests/auto/sql/kernel/qsqldatabase/.gitignore
index 1dfa12b8d4..1dfa12b8d4 100644
--- a/tests/auto/qsqldatabase/.gitignore
+++ b/tests/auto/sql/kernel/qsqldatabase/.gitignore
diff --git a/tests/auto/qsqldatabase/qsqldatabase.pro b/tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro
index ee78b79c36..ee78b79c36 100644
--- a/tests/auto/qsqldatabase/qsqldatabase.pro
+++ b/tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro
diff --git a/tests/auto/qsqldatabase/testdata/qtest.mdb b/tests/auto/sql/kernel/qsqldatabase/testdata/qtest.mdb
index f388f192ac..f388f192ac 100755
--- a/tests/auto/qsqldatabase/testdata/qtest.mdb
+++ b/tests/auto/sql/kernel/qsqldatabase/testdata/qtest.mdb
diff --git a/tests/auto/qsqldatabase/tst_databases.h b/tests/auto/sql/kernel/qsqldatabase/tst_databases.h
index 497f5a49df..497f5a49df 100644
--- a/tests/auto/qsqldatabase/tst_databases.h
+++ b/tests/auto/sql/kernel/qsqldatabase/tst_databases.h
diff --git a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
index 85ec28a671..85ec28a671 100644
--- a/tests/auto/qsqldatabase/tst_qsqldatabase.cpp
+++ b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
diff --git a/tests/auto/qsqldriver/qsqldriver.pro b/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro
index c02d74a527..c02d74a527 100644
--- a/tests/auto/qsqldriver/qsqldriver.pro
+++ b/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro
diff --git a/tests/auto/qsqldriver/tst_qsqldriver.cpp b/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp
index 6e47c24078..6e47c24078 100644
--- a/tests/auto/qsqldriver/tst_qsqldriver.cpp
+++ b/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp
diff --git a/tests/auto/qsqlerror/.gitignore b/tests/auto/sql/kernel/qsqlerror/.gitignore
index 08997ebd99..08997ebd99 100644
--- a/tests/auto/qsqlerror/.gitignore
+++ b/tests/auto/sql/kernel/qsqlerror/.gitignore
diff --git a/tests/auto/qsqlerror/qsqlerror.pro b/tests/auto/sql/kernel/qsqlerror/qsqlerror.pro
index ebf6d24381..ebf6d24381 100644
--- a/tests/auto/qsqlerror/qsqlerror.pro
+++ b/tests/auto/sql/kernel/qsqlerror/qsqlerror.pro
diff --git a/tests/auto/qsqlerror/tst_qsqlerror.cpp b/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp
index d02b373c73..d02b373c73 100644
--- a/tests/auto/qsqlerror/tst_qsqlerror.cpp
+++ b/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp
diff --git a/tests/auto/qsqlfield/.gitignore b/tests/auto/sql/kernel/qsqlfield/.gitignore
index 441ff77ec0..441ff77ec0 100644
--- a/tests/auto/qsqlfield/.gitignore
+++ b/tests/auto/sql/kernel/qsqlfield/.gitignore
diff --git a/tests/auto/qsqlfield/qsqlfield.pro b/tests/auto/sql/kernel/qsqlfield/qsqlfield.pro
index 2359151f13..2359151f13 100644
--- a/tests/auto/qsqlfield/qsqlfield.pro
+++ b/tests/auto/sql/kernel/qsqlfield/qsqlfield.pro
diff --git a/tests/auto/qsqlfield/tst_qsqlfield.cpp b/tests/auto/sql/kernel/qsqlfield/tst_qsqlfield.cpp
index 63f320151f..63f320151f 100644
--- a/tests/auto/qsqlfield/tst_qsqlfield.cpp
+++ b/tests/auto/sql/kernel/qsqlfield/tst_qsqlfield.cpp
diff --git a/tests/auto/qsqlquery/.gitignore b/tests/auto/sql/kernel/qsqlquery/.gitignore
index e8aefc3e00..e8aefc3e00 100644
--- a/tests/auto/qsqlquery/.gitignore
+++ b/tests/auto/sql/kernel/qsqlquery/.gitignore
diff --git a/tests/auto/qsqlquery/qsqlquery.pro b/tests/auto/sql/kernel/qsqlquery/qsqlquery.pro
index fbcc998900..fbcc998900 100644
--- a/tests/auto/qsqlquery/qsqlquery.pro
+++ b/tests/auto/sql/kernel/qsqlquery/qsqlquery.pro
diff --git a/tests/auto/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
index dc0c86d6f4..dc0c86d6f4 100644
--- a/tests/auto/qsqlquery/tst_qsqlquery.cpp
+++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
diff --git a/tests/auto/qsqlrecord/.gitignore b/tests/auto/sql/kernel/qsqlrecord/.gitignore
index 0235188129..0235188129 100644
--- a/tests/auto/qsqlrecord/.gitignore
+++ b/tests/auto/sql/kernel/qsqlrecord/.gitignore
diff --git a/tests/auto/qsqlrecord/qsqlrecord.pro b/tests/auto/sql/kernel/qsqlrecord/qsqlrecord.pro
index 16e3ae4f80..16e3ae4f80 100644
--- a/tests/auto/qsqlrecord/qsqlrecord.pro
+++ b/tests/auto/sql/kernel/qsqlrecord/qsqlrecord.pro
diff --git a/tests/auto/qsqlrecord/tst_qsqlrecord.cpp b/tests/auto/sql/kernel/qsqlrecord/tst_qsqlrecord.cpp
index c84e39fb2a..c84e39fb2a 100644
--- a/tests/auto/qsqlrecord/tst_qsqlrecord.cpp
+++ b/tests/auto/sql/kernel/qsqlrecord/tst_qsqlrecord.cpp
diff --git a/tests/auto/qsqlthread/.gitignore b/tests/auto/sql/kernel/qsqlthread/.gitignore
index 4108739f86..4108739f86 100644
--- a/tests/auto/qsqlthread/.gitignore
+++ b/tests/auto/sql/kernel/qsqlthread/.gitignore
diff --git a/tests/auto/qsqlthread/qsqlthread.pro b/tests/auto/sql/kernel/qsqlthread/qsqlthread.pro
index 2e4c72ac92..2e4c72ac92 100644
--- a/tests/auto/qsqlthread/qsqlthread.pro
+++ b/tests/auto/sql/kernel/qsqlthread/qsqlthread.pro
diff --git a/tests/auto/qsqlthread/tst_qsqlthread.cpp b/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp
index d39b69151c..d39b69151c 100644
--- a/tests/auto/qsqlthread/tst_qsqlthread.cpp
+++ b/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp
diff --git a/tests/auto/sql/models/models.pro b/tests/auto/sql/models/models.pro
new file mode 100644
index 0000000000..d04ba01710
--- /dev/null
+++ b/tests/auto/sql/models/models.pro
@@ -0,0 +1,6 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qsqlquerymodel \
+   qsqlrelationaltablemodel \
+   qsqltablemodel \
+
diff --git a/tests/auto/qsqlquerymodel/.gitignore b/tests/auto/sql/models/qsqlquerymodel/.gitignore
index e5ff8accf6..e5ff8accf6 100644
--- a/tests/auto/qsqlquerymodel/.gitignore
+++ b/tests/auto/sql/models/qsqlquerymodel/.gitignore
diff --git a/tests/auto/qsqlquerymodel/qsqlquerymodel.pro b/tests/auto/sql/models/qsqlquerymodel/qsqlquerymodel.pro
index 0664bae6e9..0664bae6e9 100644
--- a/tests/auto/qsqlquerymodel/qsqlquerymodel.pro
+++ b/tests/auto/sql/models/qsqlquerymodel/qsqlquerymodel.pro
diff --git a/tests/auto/qsqlquerymodel/tst_qsqlquerymodel.cpp b/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp
index 073f3da137..fabba48d7c 100644
--- a/tests/auto/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=
diff --git a/tests/auto/qsqlrelationaltablemodel/.gitignore b/tests/auto/sql/models/qsqlrelationaltablemodel/.gitignore
index b6f469c4dc..b6f469c4dc 100644
--- a/tests/auto/qsqlrelationaltablemodel/.gitignore
+++ b/tests/auto/sql/models/qsqlrelationaltablemodel/.gitignore
diff --git a/tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro b/tests/auto/sql/models/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
index dad42d512c..dad42d512c 100644
--- a/tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
+++ b/tests/auto/sql/models/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
diff --git a/tests/auto/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp b/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
index 5f1a6211aa..2c5af13c0c 100644
--- a/tests/auto/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__)),
diff --git a/tests/auto/qsqltablemodel/.gitignore b/tests/auto/sql/models/qsqltablemodel/.gitignore
index 460982f59c..460982f59c 100644
--- a/tests/auto/qsqltablemodel/.gitignore
+++ b/tests/auto/sql/models/qsqltablemodel/.gitignore
diff --git a/tests/auto/qsqltablemodel/qsqltablemodel.pro b/tests/auto/sql/models/qsqltablemodel/qsqltablemodel.pro
index e49020f0a6..e49020f0a6 100644
--- a/tests/auto/qsqltablemodel/qsqltablemodel.pro
+++ b/tests/auto/sql/models/qsqltablemodel/qsqltablemodel.pro
diff --git a/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp
index 96a1f1caa5..07efd4a3a1 100644
--- a/tests/auto/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__)),
diff --git a/tests/auto/sql/sql.pro b/tests/auto/sql/sql.pro
new file mode 100644
index 0000000000..99f6e38cf8
--- /dev/null
+++ b/tests/auto/sql/sql.pro
@@ -0,0 +1,5 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   kernel \
+   models \
+