diff --git a/tests/auto/debugger/debugger.pro b/tests/auto/debugger/debugger.pro index fa95b89dca15a91077b566e8077587f1e349e3ec..fb9fb2f41d2685c49709cbb65fefae6f2bd9164c 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 7fc000fbc958815ad6c0b6c57a097d619f7ba5c1..fc0688d728882fccd0a515a6aef69c49c4ee0987 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 82c17f71ea0b01bbb6dc36d54d0f22ec5d19e451..d7389cfdc2750fd670ad227a6f85b9b9bdac7edd 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 afb23d329eadfe68e8f18d0015736b742b2bcada..26bd502bf6c2d4b4c52a9f03fa75cdf86bb73cbd 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);