Tests: Move auto/utils_stringutils to auto/utils/stringutils

Change-Id: I475a5914f3b65656dc12cf7619bfed34e9fc8b74 Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-01-16 13:24:14 +01:00
parent 0f0f7f1d3f
commit 4f6279256d
7 changed files with 5 additions and 5 deletions
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -15,7 +15,6 @@ SUBDIRS += \
    ioutils \
    qtcprocess \
    utils \
-    utils_stringutils \
    filesearch \
    valgrind

--- a/tests/auto/auto.qbs
+++ b/tests/auto/auto.qbs
@@ -21,7 +21,6 @@ Project {
        "timeline/timeline.qbs",
        "treeviewfind/treeviewfind.qbs",
        "utils/utils.qbs",
-        "utils_stringutils/utils_stringutils.qbs",
        "valgrind/valgrind.qbs"
    ]
 }
--- a/tests/auto/utils_stringutils/utils_stringutils.pro
+++ b/tests/auto/utils_stringutils/utils_stringutils.pro
@@ -1,5 +1,5 @@
 QTC_LIB_DEPENDS += utils
-include(../qttest.pri)
+include(../../qttest.pri)

 DEFINES -= QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION

--- a/tests/auto/utils_stringutils/utils_stringutils.qbs
+++ b/tests/auto/utils_stringutils/utils_stringutils.qbs
--- a/tests/auto/utils/stringutils/tst_stringutils.cpp
+++ b/tests/auto/utils/stringutils/tst_stringutils.cpp
--- a/tests/auto/utils/utils.pro
+++ b/tests/auto/utils/utils.pro
@@ -3,4 +3,5 @@ CONFIG += ordered

 SUBDIRS = \
    fileutils \
-    ansiescapecodehandler
+    ansiescapecodehandler \
+    stringutils
--- a/tests/auto/utils/utils.qbs
+++ b/tests/auto/utils/utils.qbs
@@ -4,6 +4,7 @@ Project {
    name: "Utils autotests"
    references: [
        "fileutils/fileutils.qbs",
-        "ansiescapecodehandler/ansiescapecodehandler.qbs"
+        "ansiescapecodehandler/ansiescapecodehandler.qbs",
+        "stringutils/stringutils.qbs"
    ]
 }