aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhjk <hjk121@nokiamail.com>2013-02-12 17:47:20 +0100
committerhjk <hjk121@nokiamail.com>2013-02-12 17:48:28 +0100
commitaa9d4b0b76be5e645a99decaaa4ee94ea32f3382 (patch)
tree368c75f9c812ffc49b0d6678951f8765391e0ca4
parent117f6164e01c4ae2ffcace7773e1527c76493954 (diff)
Debugger: Don't build outdated auto tests
Change-Id: I00693667453cd8c99691e41bedda91891e60de25 Reviewed-by: hjk <hjk121@nokiamail.com>
-rw-r--r--tests/auto/debugger/debugger.pro2
-rw-r--r--tests/auto/debugger/gdb.pro4
-rw-r--r--tests/auto/debugger/olddumpers.pro4
-rw-r--r--tests/auto/debugger/tst_version.cpp2
4 files changed, 10 insertions, 2 deletions
diff --git a/tests/auto/debugger/debugger.pro b/tests/auto/debugger/debugger.pro
index fa95b89dca..fb9fb2f41d 100644
--- a/tests/auto/debugger/debugger.pro
+++ b/tests/auto/debugger/debugger.pro
@@ -6,5 +6,5 @@ SUBDIRS += dumpers.pro
#SUBDIRS += olddumpers.pro
SUBDIRS += namedemangler.pro
-!win32-msvc*: SUBDIRS += gdb.pro
+#!win32-msvc*: SUBDIRS += gdb.pro
diff --git a/tests/auto/debugger/gdb.pro b/tests/auto/debugger/gdb.pro
index 7fc000fbc9..fc0688d728 100644
--- a/tests/auto/debugger/gdb.pro
+++ b/tests/auto/debugger/gdb.pro
@@ -1,3 +1,7 @@
+
+
+# These tests should be merged into tst_dumpers.cpp
+
include(../qttest.pri)
include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
diff --git a/tests/auto/debugger/olddumpers.pro b/tests/auto/debugger/olddumpers.pro
index 82c17f71ea..d7389cfdc2 100644
--- a/tests/auto/debugger/olddumpers.pro
+++ b/tests/auto/debugger/olddumpers.pro
@@ -1,3 +1,7 @@
+
+
+# These tests should mostly be merged into tst_dumpers.cpp
+
greaterThan(QT_MAJOR_VERSION, 4): QT += core-private
include(../qttest.pri)
include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
diff --git a/tests/auto/debugger/tst_version.cpp b/tests/auto/debugger/tst_version.cpp
index afb23d329e..26bd502bf6 100644
--- a/tests/auto/debugger/tst_version.cpp
+++ b/tests/auto/debugger/tst_version.cpp
@@ -56,7 +56,7 @@ void tst_Version::version()
bool mac = true;
bool qnx = true;
Debugger::Internal::extractGdbVersion(msg, &v, &bv, &mac, &qnx);
- qDebug() << msg << " -> " << v << bv << mac << qnx;
+ //qDebug() << msg << " -> " << v << bv << mac << qnx;
QCOMPARE(v, gdbVersion);
QCOMPARE(bv, gdbBuildVersion);
QCOMPARE(mac, isMacGdb);