From: Kai Koehne Date: Sat, 15 Oct 2011 15:43:55 +0000 (+0200) Subject: Debugger: Move debugging autotests into own folder X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=751c10d1471a8c3ccc81ce47adc642c1f6f0c2f7;p=konrad%2Fqtdeclarative.git Debugger: Move debugging autotests into own folder This mirrors the source tree structure and makes it easier to run them all in one go. Change-Id: Ia191790eaec2c409857c41aff479d2ebd144aaf8 Reviewed-by: Kai Koehne --- diff --git a/tests/auto/declarative/debugger/debugger.pro b/tests/auto/declarative/debugger/debugger.pro new file mode 100644 index 0000000..3ea5c41 --- /dev/null +++ b/tests/auto/declarative/debugger/debugger.pro @@ -0,0 +1,12 @@ +TEMPLATE = subdirs + +PRIVATETESTS += \ + qdeclarativeenginedebug \ + qdeclarativedebugclient \ + qdeclarativedebugservice \ +# qdeclarativedebugjs \ + qpacketprotocol + +contains(QT_CONFIG, private_tests) { + SUBDIRS += $$PRIVATETESTS +} diff --git a/tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro b/tests/auto/declarative/debugger/qdeclarativedebugclient/qdeclarativedebugclient.pro similarity index 100% rename from tests/auto/declarative/qdeclarativedebugclient/qdeclarativedebugclient.pro rename to tests/auto/declarative/debugger/qdeclarativedebugclient/qdeclarativedebugclient.pro diff --git a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp b/tests/auto/declarative/debugger/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp similarity index 99% rename from tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp rename to tests/auto/declarative/debugger/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp index 220669a..55a49c7 100644 --- a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp +++ b/tests/auto/declarative/debugger/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp @@ -47,7 +47,7 @@ #include -#include "../../../shared/util.h" +#include "../../../../shared/util.h" #include "../shared/debugutil_p.h" #define PORT 13770 diff --git a/tests/auto/declarative/qdeclarativedebugjs/data/test.js b/tests/auto/declarative/debugger/qdeclarativedebugjs/data/test.js similarity index 100% rename from tests/auto/declarative/qdeclarativedebugjs/data/test.js rename to tests/auto/declarative/debugger/qdeclarativedebugjs/data/test.js diff --git a/tests/auto/declarative/qdeclarativedebugjs/data/test.qml b/tests/auto/declarative/debugger/qdeclarativedebugjs/data/test.qml similarity index 100% rename from tests/auto/declarative/qdeclarativedebugjs/data/test.qml rename to tests/auto/declarative/debugger/qdeclarativedebugjs/data/test.qml diff --git a/tests/auto/declarative/qdeclarativedebugjs/qdeclarativedebugjs.pro b/tests/auto/declarative/debugger/qdeclarativedebugjs/qdeclarativedebugjs.pro similarity index 100% rename from tests/auto/declarative/qdeclarativedebugjs/qdeclarativedebugjs.pro rename to tests/auto/declarative/debugger/qdeclarativedebugjs/qdeclarativedebugjs.pro diff --git a/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp b/tests/auto/declarative/debugger/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp similarity index 99% rename from tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp rename to tests/auto/declarative/debugger/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp index fbc1ff6..ee40056 100644 --- a/tests/auto/declarative/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp +++ b/tests/auto/declarative/debugger/qdeclarativedebugjs/tst_qdeclarativedebugjs.cpp @@ -50,9 +50,8 @@ #include //QDeclarativeDebugTest -#include "../../../shared/util.h" #include "../shared/debugutil_p.h" -#include "../shared/util.h" +#include "../../shared/util.h" const char *SEQ = "seq"; const char *TYPE = "type"; diff --git a/tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro b/tests/auto/declarative/debugger/qdeclarativedebugservice/qdeclarativedebugservice.pro similarity index 100% rename from tests/auto/declarative/qdeclarativedebugservice/qdeclarativedebugservice.pro rename to tests/auto/declarative/debugger/qdeclarativedebugservice/qdeclarativedebugservice.pro diff --git a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp b/tests/auto/declarative/debugger/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp similarity index 98% rename from tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp rename to tests/auto/declarative/debugger/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp index 011bd40..91e06ce 100644 --- a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp +++ b/tests/auto/declarative/debugger/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp @@ -50,7 +50,8 @@ #include #include -#include "../../../shared/util.h" +#include "../../../../shared/util.h" +#include "../../shared/util.h" #include "../shared/debugutil_p.h" diff --git a/tests/auto/declarative/qdeclarativeenginedebug/qdeclarativeenginedebug.pro b/tests/auto/declarative/debugger/qdeclarativeenginedebug/qdeclarativeenginedebug.pro similarity index 100% rename from tests/auto/declarative/qdeclarativeenginedebug/qdeclarativeenginedebug.pro rename to tests/auto/declarative/debugger/qdeclarativeenginedebug/qdeclarativeenginedebug.pro diff --git a/tests/auto/declarative/qdeclarativeenginedebug/tst_qdeclarativeenginedebug.cpp b/tests/auto/declarative/debugger/qdeclarativeenginedebug/tst_qdeclarativeenginedebug.cpp similarity index 99% rename from tests/auto/declarative/qdeclarativeenginedebug/tst_qdeclarativeenginedebug.cpp rename to tests/auto/declarative/debugger/qdeclarativeenginedebug/tst_qdeclarativeenginedebug.cpp index 0e4eebb..7ef2ee1 100644 --- a/tests/auto/declarative/qdeclarativeenginedebug/tst_qdeclarativeenginedebug.cpp +++ b/tests/auto/declarative/debugger/qdeclarativeenginedebug/tst_qdeclarativeenginedebug.cpp @@ -58,7 +58,7 @@ #include #include -#include "../../../shared/util.h" +#include "../../../../shared/util.h" #include "../shared/debugutil_p.h" Q_DECLARE_METATYPE(QDeclarativeDebugWatch::State) diff --git a/tests/auto/declarative/qpacketprotocol/qpacketprotocol.pro b/tests/auto/declarative/debugger/qpacketprotocol/qpacketprotocol.pro similarity index 100% rename from tests/auto/declarative/qpacketprotocol/qpacketprotocol.pro rename to tests/auto/declarative/debugger/qpacketprotocol/qpacketprotocol.pro diff --git a/tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp b/tests/auto/declarative/debugger/qpacketprotocol/tst_qpacketprotocol.cpp similarity index 100% rename from tests/auto/declarative/qpacketprotocol/tst_qpacketprotocol.cpp rename to tests/auto/declarative/debugger/qpacketprotocol/tst_qpacketprotocol.cpp diff --git a/tests/auto/declarative/shared/debugutil.cpp b/tests/auto/declarative/debugger/shared/debugutil.cpp similarity index 100% rename from tests/auto/declarative/shared/debugutil.cpp rename to tests/auto/declarative/debugger/shared/debugutil.cpp diff --git a/tests/auto/declarative/shared/debugutil_p.h b/tests/auto/declarative/debugger/shared/debugutil_p.h similarity index 100% rename from tests/auto/declarative/shared/debugutil_p.h rename to tests/auto/declarative/debugger/shared/debugutil_p.h diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro index 7193182..831061d 100644 --- a/tests/auto/declarative/declarative.pro +++ b/tests/auto/declarative/declarative.pro @@ -35,10 +35,6 @@ PRIVATETESTS += \ qdeclarativebinding \ qdeclarativechangeset \ qdeclarativeconnection \ - qdeclarativeenginedebug \ - qdeclarativedebugclient \ - qdeclarativedebugservice \ -# qdeclarativedebugjs \ qdeclarativeecmascript \ qdeclarativeexpression \ qdeclarativefontloader \ @@ -61,7 +57,6 @@ PRIVATETESTS += \ qdeclarativevaluetypes \ qdeclarativeworkerscript \ qdeclarativexmllistmodel \ - qpacketprotocol \ v4 # This test requires the xmlpatterns module @@ -96,8 +91,8 @@ SGTESTS = \ SUBDIRS += $$PUBLICTESTS - SUBDIRS += $$METATYPETESTS +SUBDIRS += debugger contains(QT_CONFIG, private_tests) { SUBDIRS += $$PRIVATETESTS