split the qstringbuilder autotest into four

Some S60 and WinCE test scripts prefer to have only one executable per
directory.

15 files changed, 38 insertions, 43 deletions

diff --git a/tests/auto/qstringbuilder/qstringbuilder.pro b/tests/auto/qstringbuilder/qstringbuilder.pro
deleted file mode 100644
index c5a26d3..0000000
--- a/tests/auto/qstringbuilder/qstringbuilder.pro
+++ /dev/null
@@ -1,5 +0,0 @@
-
-TEMPLATE = subdirs
-SUBDIRS = scenario1.pro scenario2.pro scenario3.pro scenario4.pro
-
-
diff --git a/tests/auto/qstringbuilder/scenario1.pro b/tests/auto/qstringbuilder/scenario1.pro
deleted file mode 100644
index d72451c..0000000
--- a/tests/auto/qstringbuilder/scenario1.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-load(qttest_p4)
-
-QT = core
-
-SOURCES  += scenario1.cpp
-HEADERS  += tst_qstringbuilder.h
-
-DEFINES += SCENARIO=1
-
diff --git a/tests/auto/qstringbuilder/scenario2.pro b/tests/auto/qstringbuilder/scenario2.pro
deleted file mode 100644
index 78e0c68..0000000
--- a/tests/auto/qstringbuilder/scenario2.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-load(qttest_p4)
-
-QT = core
-
-SOURCES  += scenario2.cpp
-HEADERS  += tst_qstringbuilder.h
-
-DEFINES += SCENARIO=2
diff --git a/tests/auto/qstringbuilder/scenario3.pro b/tests/auto/qstringbuilder/scenario3.pro
deleted file mode 100644
index 7b9e5af..0000000
--- a/tests/auto/qstringbuilder/scenario3.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-load(qttest_p4)
-
-QT = core
-
-SOURCES  += scenario3.cpp
-HEADERS  += tst_qstringbuilder.h
-
-DEFINES += SCENARIO=3
diff --git a/tests/auto/qstringbuilder/scenario4.pro b/tests/auto/qstringbuilder/scenario4.pro
deleted file mode 100644
index 1b62b25..0000000
--- a/tests/auto/qstringbuilder/scenario4.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-load(qttest_p4)
-
-QT = core
-
-SOURCES  += scenario4.cpp
-HEADERS  += tst_qstringbuilder.h
-
-DEFINES += SCENARIO=4
diff --git a/tests/auto/qstringbuilder1/qstringbuilder1.pro b/tests/auto/qstringbuilder1/qstringbuilder1.pro
new file mode 100644
index 0000000..1ca9d45
--- /dev/null
+++ b/tests/auto/qstringbuilder1/qstringbuilder1.pro
@@ -0,0 +1,9 @@
+load(qttest_p4)
+
+QT = core
+
+SOURCES  += tst_qstringbuilder1.cpp
+HEADERS  += ../qstringbuilder1/stringbuilder.h
+
+DEFINES += SCENARIO=1
+
diff --git a/tests/auto/qstringbuilder/tst_qstringbuilder.cpp b/tests/auto/qstringbuilder1/stringbuilder.cpp
index ffe7739..c26099a 100644
--- a/tests/auto/qstringbuilder/tst_qstringbuilder.cpp
+++ b/tests/auto/qstringbuilder1/stringbuilder.cpp
@@ -86,7 +86,7 @@
 #endif
 
 #include <QtTest/QtTest>
-#include "tst_qstringbuilder.h"
+#include "stringbuilder.h"
 
 //TESTED_CLASS=QStringBuilder
 //TESTED_FILES=qstringbuilder.cpp
diff --git a/tests/auto/qstringbuilder/tst_qstringbuilder.h b/tests/auto/qstringbuilder1/stringbuilder.h
index b7e7f5a..b7e7f5a 100644
--- a/tests/auto/qstringbuilder/tst_qstringbuilder.h
+++ b/tests/auto/qstringbuilder1/stringbuilder.h
diff --git a/tests/auto/qstringbuilder/scenario3.cpp b/tests/auto/qstringbuilder1/tst_qstringbuilder1.cpp
index 9159649..f6fa7c0 100644
--- a/tests/auto/qstringbuilder/scenario3.cpp
+++ b/tests/auto/qstringbuilder1/tst_qstringbuilder1.cpp
@@ -39,4 +39,4 @@
 **
 ****************************************************************************/
 
-#include "tst_qstringbuilder.cpp"
+#include "../qstringbuilder1/stringbuilder.cpp"
diff --git a/tests/auto/qstringbuilder2/qstringbuilder2.pro b/tests/auto/qstringbuilder2/qstringbuilder2.pro
new file mode 100644
index 0000000..c0b3ebc
--- /dev/null
+++ b/tests/auto/qstringbuilder2/qstringbuilder2.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+
+QT = core
+
+SOURCES  += tst_qstringbuilder2.cpp
+HEADERS  += ../qstringbuilder1/stringbuilder.h
+
+DEFINES += SCENARIO=2
diff --git a/tests/auto/qstringbuilder/scenario1.cpp b/tests/auto/qstringbuilder2/tst_qstringbuilder2.cpp
index 9159649..f6fa7c0 100644
--- a/tests/auto/qstringbuilder/scenario1.cpp
+++ b/tests/auto/qstringbuilder2/tst_qstringbuilder2.cpp
@@ -39,4 +39,4 @@
 **
 ****************************************************************************/
 
-#include "tst_qstringbuilder.cpp"
+#include "../qstringbuilder1/stringbuilder.cpp"
diff --git a/tests/auto/qstringbuilder3/qstringbuilder3.pro b/tests/auto/qstringbuilder3/qstringbuilder3.pro
new file mode 100644
index 0000000..93d1a39
--- /dev/null
+++ b/tests/auto/qstringbuilder3/qstringbuilder3.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+
+QT = core
+
+SOURCES  += tst_qstringbuilder3.cpp
+HEADERS  += ../qstringbuilder1/stringbuilder.h
+
+DEFINES += SCENARIO=3
diff --git a/tests/auto/qstringbuilder/scenario2.cpp b/tests/auto/qstringbuilder3/tst_qstringbuilder3.cpp
index 9159649..f6fa7c0 100644
--- a/tests/auto/qstringbuilder/scenario2.cpp
+++ b/tests/auto/qstringbuilder3/tst_qstringbuilder3.cpp
@@ -39,4 +39,4 @@
 **
 ****************************************************************************/
 
-#include "tst_qstringbuilder.cpp"
+#include "../qstringbuilder1/stringbuilder.cpp"
diff --git a/tests/auto/qstringbuilder4/qstringbuilder4.pro b/tests/auto/qstringbuilder4/qstringbuilder4.pro
new file mode 100644
index 0000000..eeec447
--- /dev/null
+++ b/tests/auto/qstringbuilder4/qstringbuilder4.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+
+QT = core
+
+SOURCES  += tst_qstringbuilder4.cpp
+HEADERS  += ../qstringbuilder1/stringbuilder.h
+
+DEFINES += SCENARIO=4
diff --git a/tests/auto/qstringbuilder/scenario4.cpp b/tests/auto/qstringbuilder4/tst_qstringbuilder4.cpp
index 25f7932..480db66 100644
--- a/tests/auto/qstringbuilder/scenario4.cpp
+++ b/tests/auto/qstringbuilder4/tst_qstringbuilder4.cpp
@@ -39,4 +39,4 @@
 **
 ****************************************************************************/
 
-#include "tst_qstringbuilder.cpp"
+#include "../qstringbuilder1/stringbuilder.cpp"