From aa9d4b0b76be5e645a99decaaa4ee94ea32f3382 Mon Sep 17 00:00:00 2001
From: hjk <hjk121@nokiamail.com>
Date: Tue, 12 Feb 2013 17:47:20 +0100
Subject: [PATCH] Debugger: Don't build outdated auto tests
Change-Id: I00693667453cd8c99691e41bedda91891e60de25
Reviewed-by: hjk <hjk121@nokiamail.com>
---
tests/auto/debugger/debugger.pro | 2 +-
tests/auto/debugger/gdb.pro | 4 ++++
tests/auto/debugger/olddumpers.pro | 4 ++++
tests/auto/debugger/tst_version.cpp | 2 +-
4 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/tests/auto/debugger/debugger.pro b/tests/auto/debugger/debugger.pro
index fa95b89dca1..fb9fb2f41d2 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 7fc000fbc95..fc0688d7288 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 82c17f71ea0..d7389cfdc27 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 afb23d329ea..26bd502bf6c 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);
--
GitLab