diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index d9653e88a15..e79e1757292 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -14,7 +14,8 @@ SUBDIRS += \ qtcprocess \ utils \ utils_stringutils \ - filesearch + filesearch \ + valgrind #contains (QT_CONFIG, declarative) { #SUBDIRS += qml diff --git a/tests/valgrind/README b/tests/auto/valgrind/README similarity index 93% rename from tests/valgrind/README rename to tests/auto/valgrind/README index db43debdae7..daac03a3d52 100644 --- a/tests/valgrind/README +++ b/tests/auto/valgrind/README @@ -11,5 +11,5 @@ cd valgrind-test export LD_LIBRARY_PATH=/path/to/qtc-build/lib/qtcreator:/path/to/qtc-build/lib/qtcreator/plugins/QtProject # run qmake, make -qmake CONFIG+=debug IDE_BUILD_TREE=$(readlink -f ..) ../../path/to/qtc/tests/valgrind +qmake CONFIG+=debug IDE_BUILD_TREE=$(readlink -f ..) ../../path/to/qtc/tests/auto/valgrind make diff --git a/tests/valgrind/callgrind/callgrind.pro b/tests/auto/valgrind/callgrind/callgrind.pro similarity index 100% rename from tests/valgrind/callgrind/callgrind.pro rename to tests/auto/valgrind/callgrind/callgrind.pro diff --git a/tests/valgrind/callgrind/callgrindparsertests.cpp b/tests/auto/valgrind/callgrind/callgrindparsertests.cpp similarity index 100% rename from tests/valgrind/callgrind/callgrindparsertests.cpp rename to tests/auto/valgrind/callgrind/callgrindparsertests.cpp diff --git a/tests/valgrind/callgrind/callgrindparsertests.h b/tests/auto/valgrind/callgrind/callgrindparsertests.h similarity index 100% rename from tests/valgrind/callgrind/callgrindparsertests.h rename to tests/auto/valgrind/callgrind/callgrindparsertests.h diff --git a/tests/valgrind/callgrind/callgrindparsertests.pro b/tests/auto/valgrind/callgrind/callgrindparsertests.pro similarity index 70% rename from tests/valgrind/callgrind/callgrindparsertests.pro rename to tests/auto/valgrind/callgrind/callgrindparsertests.pro index 99ccfb9bd0d..3b77e9ac826 100644 --- a/tests/valgrind/callgrind/callgrindparsertests.pro +++ b/tests/auto/valgrind/callgrind/callgrindparsertests.pro @@ -1,10 +1,10 @@ -include(../../auto/qttest.pri) +include(../../qttest.pri) include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri) include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) include($$IDE_SOURCE_TREE/src/libs/ssh/ssh.pri) -TARGET = callgrindparsertests +TARGET = tst_callgrindparsertests -DEFINES += "PARSERTESTS_DATA_DIR=\\\"$$PWD/data\\\"" +DEFINES += "PARSERTESTS_DATA_DIR=\\\"$$_PRO_FILE_PWD_/data\\\"" #enable extra debugging code DEFINES += "CALLGRINDPARSERTESTS" diff --git a/tests/valgrind/callgrind/data/calleeFunctions.out b/tests/auto/valgrind/callgrind/data/calleeFunctions.out similarity index 100% rename from tests/valgrind/callgrind/data/calleeFunctions.out rename to tests/auto/valgrind/callgrind/data/calleeFunctions.out diff --git a/tests/valgrind/callgrind/data/callgrind.out.sample b/tests/auto/valgrind/callgrind/data/callgrind.out.sample similarity index 100% rename from tests/valgrind/callgrind/data/callgrind.out.sample rename to tests/auto/valgrind/callgrind/data/callgrind.out.sample diff --git a/tests/valgrind/callgrind/data/callgrind.out.sample.annotated b/tests/auto/valgrind/callgrind/data/callgrind.out.sample.annotated similarity index 100% rename from tests/valgrind/callgrind/data/callgrind.out.sample.annotated rename to tests/auto/valgrind/callgrind/data/callgrind.out.sample.annotated diff --git a/tests/valgrind/callgrind/data/callgrind.out.sample.expected b/tests/auto/valgrind/callgrind/data/callgrind.out.sample.expected similarity index 100% rename from tests/valgrind/callgrind/data/callgrind.out.sample.expected rename to tests/auto/valgrind/callgrind/data/callgrind.out.sample.expected diff --git a/tests/valgrind/callgrind/data/cycle.out b/tests/auto/valgrind/callgrind/data/cycle.out similarity index 100% rename from tests/valgrind/callgrind/data/cycle.out rename to tests/auto/valgrind/callgrind/data/cycle.out diff --git a/tests/valgrind/callgrind/data/inlinedFunctions.out b/tests/auto/valgrind/callgrind/data/inlinedFunctions.out similarity index 100% rename from tests/valgrind/callgrind/data/inlinedFunctions.out rename to tests/auto/valgrind/callgrind/data/inlinedFunctions.out diff --git a/tests/valgrind/callgrind/data/multiCost.out b/tests/auto/valgrind/callgrind/data/multiCost.out similarity index 100% rename from tests/valgrind/callgrind/data/multiCost.out rename to tests/auto/valgrind/callgrind/data/multiCost.out diff --git a/tests/valgrind/callgrind/data/multiCostAndPos.out b/tests/auto/valgrind/callgrind/data/multiCostAndPos.out similarity index 100% rename from tests/valgrind/callgrind/data/multiCostAndPos.out rename to tests/auto/valgrind/callgrind/data/multiCostAndPos.out diff --git a/tests/valgrind/callgrind/data/multiPos.out b/tests/auto/valgrind/callgrind/data/multiPos.out similarity index 100% rename from tests/valgrind/callgrind/data/multiPos.out rename to tests/auto/valgrind/callgrind/data/multiPos.out diff --git a/tests/valgrind/callgrind/data/recursion.out b/tests/auto/valgrind/callgrind/data/recursion.out similarity index 100% rename from tests/valgrind/callgrind/data/recursion.out rename to tests/auto/valgrind/callgrind/data/recursion.out diff --git a/tests/valgrind/callgrind/data/recursiveCycle.out b/tests/auto/valgrind/callgrind/data/recursiveCycle.out similarity index 100% rename from tests/valgrind/callgrind/data/recursiveCycle.out rename to tests/auto/valgrind/callgrind/data/recursiveCycle.out diff --git a/tests/valgrind/callgrind/data/simpleFunction.out b/tests/auto/valgrind/callgrind/data/simpleFunction.out similarity index 100% rename from tests/valgrind/callgrind/data/simpleFunction.out rename to tests/auto/valgrind/callgrind/data/simpleFunction.out diff --git a/tests/valgrind/callgrind/modeltest.cpp b/tests/auto/valgrind/callgrind/modeltest.cpp similarity index 99% rename from tests/valgrind/callgrind/modeltest.cpp rename to tests/auto/valgrind/callgrind/modeltest.cpp index 32dee035b0e..f47b4c22e6f 100644 --- a/tests/valgrind/callgrind/modeltest.cpp +++ b/tests/auto/valgrind/callgrind/modeltest.cpp @@ -226,7 +226,7 @@ int main(int argc, char *argv[]) calleeDock->setWidget(handler->calleesView()); window.addDockWidget(Qt::RightDockWidgetArea, calleeDock); - QDockWidget *widgetDock = new QDockWidget("visualisation", &window); + QDockWidget *widgetDock = new QDockWidget("vizualisation", &window); widgetDock->setWidget(handler->visualisation()); window.addDockWidget(Qt::BottomDockWidgetArea, widgetDock); diff --git a/tests/valgrind/callgrind/modeltest.h b/tests/auto/valgrind/callgrind/modeltest.h similarity index 100% rename from tests/valgrind/callgrind/modeltest.h rename to tests/auto/valgrind/callgrind/modeltest.h diff --git a/tests/valgrind/callgrind/modeltest.pro b/tests/auto/valgrind/callgrind/modeltest.pro similarity index 100% rename from tests/valgrind/callgrind/modeltest.pro rename to tests/auto/valgrind/callgrind/modeltest.pro diff --git a/tests/auto/valgrind/memcheck/data/memcheck-output-sample1.xml b/tests/auto/valgrind/memcheck/data/memcheck-output-sample1.xml new file mode 100644 index 00000000000..e4278497c9d --- /dev/null +++ b/tests/auto/valgrind/memcheck/data/memcheck-output-sample1.xml @@ -0,0 +1,370 @@ + + + + +4 +memcheck + + + Memcheck, a memory error detector + Copyright (C) 2002-2009, and GNU GPL'd, by Julian Seward et al. + Using Valgrind-3.6.0.SVN-Debian and LibVEX; rerun with -h for copyright info + Command: kate + + +22733 +17584 +memcheck + + + + /usr/bin/valgrind.bin + --suppressions=/usr/lib/valgrind/debian-libc6-dbg.supp + --xml=yes + --xml-file=test.xml + --track-origins=yes + + + kate + + + + + RUNNING + + + + + 0x9 + 1 + InvalidRead + Invalid read of size 4 + + + 0x6E47964 + /usr/lib/libQtGui.so.4.7.0 + QFrame::frameStyle() const + /build/buildd/qt4-x11-4.7.0/src/gui/widgets + qframe.cpp + 252 + + + 0x118F2AF7 + /usr/lib/kde4/plugins/styles/oxygen.so + + + 0x6A81671 + /usr/lib/libQtGui.so.4.7.0 + QWidget::event(QEvent*) + /build/buildd/qt4-x11-4.7.0/src/gui/kernel + qwidget.cpp + 8273 + + + 0x6A2B6EB + /usr/lib/libQtGui.so.4.7.0 + QApplicationPrivate::notify_helper(QObject*, QEvent*) + /build/buildd/qt4-x11-4.7.0/src/gui/kernel + qapplication.cpp + 4396 + + + + Address 0x11527cb8 is not stack'd, malloc'd or (recently) free'd + + + + + FINISHED + + + + + 0x13 + 1 + Leak_PossiblyLost + + 2 bytes in 1 blocks are possibly lost in loss record 2 of 2,003 + 2 + 1 + + + + 0x4C284A8 + /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so + malloc + /build/buildd/valgrind-3.6.0~svn20100212/coregrind/m_replacemalloc + vg_replace_malloc.c + 236 + + + 0xD4D7754 + /lib/libglib-2.0.so.0.2400.1 + g_malloc + + + 0xD4EF11D + /lib/libglib-2.0.so.0.2400.1 + g_strdup + + + 0xD503DC4 + /lib/libglib-2.0.so.0.2400.1 + g_get_language_names + + + 0xD4F89A9 + /lib/libglib-2.0.so.0.2400.1 + g_thread_init_glib + + + 0x8396569 + /usr/lib/libQtCore.so.4.7.0 + QEventDispatcherGlibPrivate::QEventDispatcherGlibPrivate(_GMainContext*) + /build/buildd/qt4-x11-4.7.0/src/corelib/kernel + qeventdispatcher_glib.cpp + 299 + + + 0x6ADDBEE + /usr/lib/libQtGui.so.4.7.0 + QGuiEventDispatcherGlibPrivate::QGuiEventDispatcherGlibPrivate() + /build/buildd/qt4-x11-4.7.0/src/gui/kernel + qguieventdispatcher_glib.cpp + 171 + + + 0x6ADDCDD + /usr/lib/libQtGui.so.4.7.0 + QGuiEventDispatcherGlib::QGuiEventDispatcherGlib(QObject*) + /build/buildd/qt4-x11-4.7.0/src/gui/kernel + qguieventdispatcher_glib.cpp + 186 + + + 0x6AA5152 + /usr/lib/libQtGui.so.4.7.0 + QApplicationPrivate::createEventDispatcher() + /build/buildd/qt4-x11-4.7.0/src/gui/kernel + qapplication_x11.cpp + 605 + + + 0x836D069 + /usr/lib/libQtCore.so.4.7.0 + QCoreApplication::init() + /build/buildd/qt4-x11-4.7.0/src/corelib/kernel + qcoreapplication.cpp + 552 + + + 0x836D134 + /usr/lib/libQtCore.so.4.7.0 + QCoreApplication::QCoreApplication(QCoreApplicationPrivate&) + /build/buildd/qt4-x11-4.7.0/src/corelib/kernel + qcoreapplication.cpp + 477 + + + 0x6A3815A + /usr/lib/libQtGui.so.4.7.0 + QApplication::QApplication(int&, char**, bool, int) + /build/buildd/qt4-x11-4.7.0/src/gui/kernel + qapplication.cpp + 745 + + + + + + 0x7e4 + 1 + Leak_DefinitelyLost + + 544,542 (56 direct, 544,486 indirect) bytes in 1 blocks are definitely lost in loss record 2,003 of 2,003 + 544542 + 1 + + + + 0x4C284A8 + /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so + malloc + /build/buildd/valgrind-3.6.0~svn20100212/coregrind/m_replacemalloc + vg_replace_malloc.c + 236 + + + 0x82A1A6C + /usr/lib/libQtCore.so.4.7.0 + QMapData::node_create(QMapData::Node**, int, int) + /build/buildd/qt4-x11-4.7.0/src/corelib/tools + qmap.cpp + 140 + + + 0x8336F68 + /usr/lib/libQtCore.so.4.7.0 + QMap<QSettingsKey, QVariant>::detach_helper() + /build/buildd/qt4-x11-4.7.0/src/corelib/../../include/QtCore/../../src/corelib/tools + qmap.h + 449 + + + 0x832C564 + /usr/lib/libQtCore.so.4.7.0 + QConfFile::mergedKeyMap() const + /build/buildd/qt4-x11-4.7.0/src/corelib/../../include/QtCore/../../src/corelib/tools + qmap.h + 202 + + + 0x833305A + /usr/lib/libQtCore.so.4.7.0 + QConfFileSettingsPrivate::syncConfFile(int) + /build/buildd/qt4-x11-4.7.0/src/corelib/io + qsettings.cpp + 1569 + + + 0x8333D5B + /usr/lib/libQtCore.so.4.7.0 + QConfFileSettingsPrivate::sync() + /build/buildd/qt4-x11-4.7.0/src/corelib/io + qsettings.cpp + 1386 + + + 0x83260D9 + /usr/lib/libQtCore.so.4.7.0 + QSettingsPrivate::update() + /build/buildd/qt4-x11-4.7.0/src/corelib/io + qsettings.cpp + 415 + + + 0x83267C7 + /usr/lib/libQtCore.so.4.7.0 + QSettings::event(QEvent*) + /build/buildd/qt4-x11-4.7.0/src/corelib/io + qsettings.cpp + 3326 + + + 0x6A2B6EB + /usr/lib/libQtGui.so.4.7.0 + QApplicationPrivate::notify_helper(QObject*, QEvent*) + /build/buildd/qt4-x11-4.7.0/src/gui/kernel + qapplication.cpp + 4396 + + + 0x6A311DC + /usr/lib/libQtGui.so.4.7.0 + QApplication::notify(QObject*, QEvent*) + /build/buildd/qt4-x11-4.7.0/src/gui/kernel + qapplication.cpp + 4277 + + + 0x6443535 + /usr/lib/libkdeui.so.5.5.0 + KApplication::notify(QObject*, QEvent*) + + + 0x83690AB + /usr/lib/libQtCore.so.4.7.0 + QCoreApplication::notifyInternal(QObject*, QEvent*) + /build/buildd/qt4-x11-4.7.0/src/corelib/kernel + qcoreapplication.cpp + 732 + + + + + + + 2 + 0x9 + + + + + + 12 + X on SUSE11 writev uninit padding + + + 2 + dl-hack3-cond-1 + + + 2 + glibc-2.5.x-on-SUSE-10.2-(PPC)-2a + + + + + diff --git a/tests/auto/valgrind/memcheck/data/memcheck-output-untitled.xml b/tests/auto/valgrind/memcheck/data/memcheck-output-untitled.xml new file mode 100644 index 00000000000..d4678d6592d --- /dev/null +++ b/tests/auto/valgrind/memcheck/data/memcheck-output-untitled.xml @@ -0,0 +1,984 @@ + + + + +4 +memcheck + + + Memcheck, a memory error detector + Copyright (C) 2002-2010, and GNU GPL'd, by Julian Seward et al. + Using Valgrind-3.6.1 and LibVEX; rerun with -h for copyright info + Command: /home/chris/untitled/untitled + + +20854 +20386 +memcheck + + + + /usr/bin/valgrind.bin + --suppressions=/usr/lib/valgrind/debian-libc6-dbg.supp + --xml=yes + --xml-file=/tmp/bla + + + /home/chris/untitled/untitled + + + + + RUNNING + + + + + + FINISHED + + + + + 0x107 + 1 + Leak_PossiblyLost + + 120 bytes in 1 blocks are possibly lost in loss record 184 of 270 + 120 + 1 + + + + 0x402517B + /usr/lib/valgrind/vgpreload_memcheck-x86-linux.so + memalign + /build/buildd/valgrind-3.6.1/coregrind/m_replacemalloc + vg_replace_malloc.c + 581 + + + 0x40251D8 + /usr/lib/valgrind/vgpreload_memcheck-x86-linux.so + posix_memalign + /build/buildd/valgrind-3.6.1/coregrind/m_replacemalloc + vg_replace_malloc.c + 709 + + + 0x42BE546 + /lib/i386-linux-gnu/libglib-2.0.so.0.2800.6 + + + 0x42BFA2F + /lib/i386-linux-gnu/libglib-2.0.so.0.2800.6 + g_slice_alloc + + + 0x42C06DD + /lib/i386-linux-gnu/libglib-2.0.so.0.2800.6 + g_slist_prepend + + + 0x42C368E + /lib/i386-linux-gnu/libglib-2.0.so.0.2800.6 + g_strsplit + + + 0x42D9393 + /lib/i386-linux-gnu/libglib-2.0.so.0.2800.6 + g_get_language_names + + + 0x42D98E6 + /lib/i386-linux-gnu/libglib-2.0.so.0.2800.6 + + + 0x42CB919 + /lib/i386-linux-gnu/libglib-2.0.so.0.2800.6 + g_thread_init_glib + + + 0x4254506 + /usr/lib/i386-linux-gnu/libgthread-2.0.so.0.2800.6 + g_thread_init + + + 0x8D4D458 + /home/chris/untitled/untitled + QEventDispatcherGlibPrivate::QEventDispatcherGlibPrivate(_GMainContext*) + + + 0x85C7CA5 + /home/chris/untitled/untitled + QGuiEventDispatcherGlibPrivate::QGuiEventDispatcherGlibPrivate() + + + + + + 0x109 + 1 + Leak_DefinitelyLost + + 122 (56 direct, 66 indirect) bytes in 1 blocks are definitely lost in loss record 186 of 270 + 122 + 1 + + + + 0x402641D + /usr/lib/valgrind/vgpreload_memcheck-x86-linux.so + operator new(unsigned int) + /build/buildd/valgrind-3.6.1/coregrind/m_replacemalloc + vg_replace_malloc.c + 255 + + + 0x8D0FC45 + /home/chris/untitled/untitled + QLibraryPrivate::findOrCreate(QString const&, QString const&) + + + 0x8D10347 + /home/chris/untitled/untitled + QLibrary::setFileNameAndVersion(QString const&, int) + + + 0x8D10404 + /home/chris/untitled/untitled + QLibrary::QLibrary(QString const&, int, QObject*) + + + 0x859BD96 + /home/chris/untitled/untitled + qt_load_library_runtime(char const*, int, int, char const*) + + + 0x859C93C + /home/chris/untitled/untitled + qt_init(QApplicationPrivate*, int, _XDisplay*, unsigned long, unsigned long) + + + 0x853EEDC + /home/chris/untitled/untitled + QApplicationPrivate::construct(_XDisplay*, unsigned long, unsigned long) + + + 0x853F766 + /home/chris/untitled/untitled + QApplication::QApplication(int&, char**, int) + + + 0x805209E + /home/chris/untitled/untitled + createApplication(int&, char**) + /home/chris/untitled/qmlapplicationviewer + qmlapplicationviewer.cpp + 175 + + + 0x805185F + /home/chris/untitled/untitled + main + /home/chris/untitled + main.cpp + 6 + + + + + + 0x10a + 1 + Leak_DefinitelyLost + + 124 bytes in 1 blocks are definitely lost in loss record 187 of 270 + 124 + 1 + + + + 0x4026864 + /usr/lib/valgrind/vgpreload_memcheck-x86-linux.so + malloc + /build/buildd/valgrind-3.6.1/coregrind/m_replacemalloc + vg_replace_malloc.c + 236 + + + 0x4635902 + /usr/lib/i386-linux-gnu/libxcb.so.1.1.0 + get_peer_sock_name + /build/buildd/libxcb-1.7/obj-i686-linux-gnu/src/../../src + xcb_auth.c + 259 + + + 0x4635A04 + /usr/lib/i386-linux-gnu/libxcb.so.1.1.0 + _xcb_get_auth_info + /build/buildd/libxcb-1.7/obj-i686-linux-gnu/src/../../src + xcb_auth.c + 302 + + + 0x46353D1 + /usr/lib/i386-linux-gnu/libxcb.so.1.1.0 + xcb_connect_to_display_with_auth_info + /build/buildd/libxcb-1.7/obj-i686-linux-gnu/src/../../src + xcb_util.c + 424 + + + 0x46355DB + /usr/lib/i386-linux-gnu/libxcb.so.1.1.0 + xcb_connect + /build/buildd/libxcb-1.7/obj-i686-linux-gnu/src/../../src + xcb_util.c + 395 + + + 0x4169A22 + /usr/lib/i386-linux-gnu/libX11.so.6.3.0 + _XConnectXCB + + + 0x41598F3 + /usr/lib/i386-linux-gnu/libX11.so.6.3.0 + XOpenDisplay + + + 0x859E45F + /home/chris/untitled/untitled + qt_init(QApplicationPrivate*, int, _XDisplay*, unsigned long, unsigned long) + + + 0x853EEDC + /home/chris/untitled/untitled + QApplicationPrivate::construct(_XDisplay*, unsigned long, unsigned long) + + + 0x853F766 + /home/chris/untitled/untitled + QApplication::QApplication(int&, char**, int) + + + 0x805209E + /home/chris/untitled/untitled + createApplication(int&, char**) + /home/chris/untitled/qmlapplicationviewer + qmlapplicationviewer.cpp + 175 + + + 0x805185F + /home/chris/untitled/untitled + main + /home/chris/untitled + main.cpp + 6 + + + + + + 0x10f + 1 + Leak_DefinitelyLost + + 138 (56 direct, 82 indirect) bytes in 1 blocks are definitely lost in loss record 192 of 270 + 138 + 1 + + + + 0x402641D + /usr/lib/valgrind/vgpreload_memcheck-x86-linux.so + operator new(unsigned int) + /build/buildd/valgrind-3.6.1/coregrind/m_replacemalloc + vg_replace_malloc.c + 255 + + + 0x8D0FC45 + /home/chris/untitled/untitled + QLibraryPrivate::findOrCreate(QString const&, QString const&) + + + 0x8D10347 + /home/chris/untitled/untitled + QLibrary::setFileNameAndVersion(QString const&, int) + + + 0x8D10404 + /home/chris/untitled/untitled + QLibrary::QLibrary(QString const&, int, QObject*) + + + 0x859BD96 + /home/chris/untitled/untitled + qt_load_library_runtime(char const*, int, int, char const*) + + + 0x859DE94 + /home/chris/untitled/untitled + qt_init(QApplicationPrivate*, int, _XDisplay*, unsigned long, unsigned long) + + + 0x853EEDC + /home/chris/untitled/untitled + QApplicationPrivate::construct(_XDisplay*, unsigned long, unsigned long) + + + 0x853F766 + /home/chris/untitled/untitled + QApplication::QApplication(int&, char**, int) + + + 0x805209E + /home/chris/untitled/untitled + createApplication(int&, char**) + /home/chris/untitled/qmlapplicationviewer + qmlapplicationviewer.cpp + 175 + + + 0x805185F + /home/chris/untitled/untitled + main + /home/chris/untitled + main.cpp + 6 + + + + + + 0x114 + 1 + Leak_DefinitelyLost + + 158 (56 direct, 102 indirect) bytes in 1 blocks are definitely lost in loss record 197 of 270 + 158 + 1 + + + + 0x402641D + /usr/lib/valgrind/vgpreload_memcheck-x86-linux.so + operator new(unsigned int) + /build/buildd/valgrind-3.6.1/coregrind/m_replacemalloc + vg_replace_malloc.c + 255 + + + 0x8D0FC45 + /home/chris/untitled/untitled + QLibraryPrivate::findOrCreate(QString const&, QString const&) + + + 0x8D1023F + /home/chris/untitled/untitled + QLibrary::setFileNameAndVersion(QString const&, QString const&) + + + 0x8D102A4 + /home/chris/untitled/untitled + QLibrary::QLibrary(QString const&, QString const&, QObject*) + + + 0x8C8FCCD + /home/chris/untitled/untitled + qt_initIcu(QString const&) + + + 0x8C4B0CF + /home/chris/untitled/untitled + QLocalePrivate::updateSystemPrivate() + + + 0x8C4B3C6 + /home/chris/untitled/untitled + systemPrivate() + + + 0x8C4B40C + /home/chris/untitled/untitled + defaultPrivate() + + + 0x8C4B55F + /home/chris/untitled/untitled + QLocale::QLocale() + + + 0x8CCF6F3 + /home/chris/untitled/untitled + QResourceFileEngine::QResourceFileEngine(QString const&) + + + 0x8CF87DC + /home/chris/untitled/untitled + _q_resolveEntryAndCreateLegacyEngine_recursive(QFileSystemEntry&, QFileSystemMetaData&, QAbstractFileEngine*&, bool) + + + 0x8CF8947 + /home/chris/untitled/untitled + QFileSystemEngine::resolveEntryAndCreateLegacyEngine(QFileSystemEntry&, QFileSystemMetaData&) + + + + + + 0x116 + 1 + Leak_PossiblyLost + + 160 bytes in 1 blocks are possibly lost in loss record 199 of 270 + 160 + 1 + + + + 0x4025315 + /usr/lib/valgrind/vgpreload_memcheck-x86-linux.so + calloc + /build/buildd/valgrind-3.6.1/coregrind/m_replacemalloc + vg_replace_malloc.c + 467 + + + 0x4010CD7 + /lib/i386-linux-gnu/ld-2.13.so + allocate_dtv + /build/buildd/eglibc-2.13/elf + dl-tls.c + 300 + + + 0x401146B + /lib/i386-linux-gnu/ld-2.13.so + _dl_allocate_tls + /build/buildd/eglibc-2.13/elf + dl-tls.c + 464 + + + 0x433E5C6 + /lib/i386-linux-gnu/libpthread-2.13.so + pthread_create@@GLIBC_2.1 + /build/buildd/eglibc-2.13/nptl + allocatestack.c + 570 + + + 0x83A6BED + /home/chris/untitled/untitled + QTWTF::TCMalloc_PageHeap::initializeScavenger() + + + 0x83A92E9 + /home/chris/untitled/untitled + QTWTF::TCMalloc_ThreadCache::InitModule() + + + 0x83AA188 + /home/chris/untitled/untitled + QTWTF::fastMalloc(unsigned int) + + + 0x83AEE4B + /home/chris/untitled/untitled + QTWTF::initializeThreading() + + + 0x8338CBF + /home/chris/untitled/untitled + QTJSC::initializeThreading() + + + 0x82897BE + /home/chris/untitled/untitled + QScriptEnginePrivate::QScriptEnginePrivate() + + + 0x828AAB2 + /home/chris/untitled/untitled + QScriptEngine::QScriptEngine() + + + 0x8063261 + /home/chris/untitled/untitled + QDeclarativeScriptEngine::QDeclarativeScriptEngine(QDeclarativeEnginePrivate*) + + + + + + 0x117 + 1 + Leak_DefinitelyLost + + 160 (40 direct, 120 indirect) bytes in 1 blocks are definitely lost in loss record 200 of 270 + 160 + 1 + + + + 0x4026864 + /usr/lib/valgrind/vgpreload_memcheck-x86-linux.so + malloc + /build/buildd/valgrind-3.6.1/coregrind/m_replacemalloc + vg_replace_malloc.c + 236 + + + 0x4565FAB + /lib/i386-linux-gnu/libc-2.13.so + nss_parse_service_list + /build/buildd/eglibc-2.13/nss + nsswitch.c + 626 + + + 0x4566584 + /lib/i386-linux-gnu/libc-2.13.so + __nss_database_lookup + /build/buildd/eglibc-2.13/nss + nsswitch.c + 167 + + + 0x6BAAE9B + + + 0x6BAC9F4 + + + 0x451C7EA + /lib/i386-linux-gnu/libc-2.13.so + getpwuid_r@@GLIBC_2.1.2 + /build/buildd/eglibc-2.13/pwd/../nss + getXXbyYY_r.c + 256 + + + 0x85A34E4 + /home/chris/untitled/untitled + sm_performSaveYourself(QSessionManagerPrivate*) + + + 0x85A3F56 + /home/chris/untitled/untitled + sm_saveYourselfCallback(_SmcConn*, void*, int, int, int, int) + + + 0x4047727 + /usr/lib/i386-linux-gnu/libSM.so.6.0.1 + _SmcProcessMessage + + + 0x405D1B5 + /usr/lib/i386-linux-gnu/libICE.so.6.3.0 + IceProcessMessages + + + 0x858FE67 + /home/chris/untitled/untitled + QSmSocketReceiver::socketActivated(int) + + + 0x8D3A9C1 + /home/chris/untitled/untitled + QMetaObject::activate(QObject*, QMetaObject const*, int, void**) + + + + + + 0x118 + 1 + Leak_DefinitelyLost + + 166 (56 direct, 110 indirect) bytes in 1 blocks are definitely lost in loss record 201 of 270 + 166 + 1 + + + + 0x402641D + /usr/lib/valgrind/vgpreload_memcheck-x86-linux.so + operator new(unsigned int) + /build/buildd/valgrind-3.6.1/coregrind/m_replacemalloc + vg_replace_malloc.c + 255 + + + 0x8D0FC45 + /home/chris/untitled/untitled + QLibraryPrivate::findOrCreate(QString const&, QString const&) + + + 0x8D1023F + /home/chris/untitled/untitled + QLibrary::setFileNameAndVersion(QString const&, QString const&) + + + 0x8D102A4 + /home/chris/untitled/untitled + QLibrary::QLibrary(QString const&, QString const&, QObject*) + + + 0x8C8FA56 + /home/chris/untitled/untitled + qt_initIcu(QString const&) + + + 0x8C4B0CF + /home/chris/untitled/untitled + QLocalePrivate::updateSystemPrivate() + + + 0x8C4B3C6 + /home/chris/untitled/untitled + systemPrivate() + + + 0x8C4B40C + /home/chris/untitled/untitled + defaultPrivate() + + + 0x8C4B55F + /home/chris/untitled/untitled + QLocale::QLocale() + + + 0x8CCF6F3 + /home/chris/untitled/untitled + QResourceFileEngine::QResourceFileEngine(QString const&) + + + 0x8CF87DC + /home/chris/untitled/untitled + _q_resolveEntryAndCreateLegacyEngine_recursive(QFileSystemEntry&, QFileSystemMetaData&, QAbstractFileEngine*&, bool) + + + 0x8CF8947 + /home/chris/untitled/untitled + QFileSystemEngine::resolveEntryAndCreateLegacyEngine(QFileSystemEntry&, QFileSystemMetaData&) + + + + + + 0x11d + 1 + Leak_DefinitelyLost + + 216 bytes in 1 blocks are definitely lost in loss record 206 of 270 + 216 + 1 + + + + 0x4026864 + /usr/lib/valgrind/vgpreload_memcheck-x86-linux.so + malloc + /build/buildd/valgrind-3.6.1/coregrind/m_replacemalloc + vg_replace_malloc.c + 236 + + + 0x4193FB2 + /usr/lib/i386-linux-gnu/libX11.so.6.3.0 + _XimOpenIM + + + 0x4193BCF + /usr/lib/i386-linux-gnu/libX11.so.6.3.0 + _XimRegisterIMInstantiateCallback + + + 0x41789A7 + /usr/lib/i386-linux-gnu/libX11.so.6.3.0 + XRegisterIMInstantiateCallback + + + 0x89FB291 + /home/chris/untitled/untitled + QXIMInputContext::QXIMInputContext() + + + 0x89F9450 + /home/chris/untitled/untitled + QInputContextFactory::create(QString const&, QObject*) + + + 0x85361C7 + /home/chris/untitled/untitled + QApplication::inputContext() const + + + 0x85662A7 + /home/chris/untitled/untitled + QWidgetPrivate::inputContext() const + + + 0x8571D7C + /home/chris/untitled/untitled + QWidget::setAttribute(Qt::WidgetAttribute, bool) + + + 0x8A54527 + /home/chris/untitled/untitled + QGraphicsViewPrivate::updateInputMethodSensitivity() + + + 0x8A55E1A + /home/chris/untitled/untitled + QGraphicsView::setScene(QGraphicsScene*) + + + 0x805273E + /home/chris/untitled/untitled + QDeclarativeViewPrivate::init() + + + + + + 0x126 + 1 + Leak_PossiblyLost + + 360 bytes in 3 blocks are possibly lost in loss record 215 of 270 + 360 + 3 + + + + 0x402517B + /usr/lib/valgrind/vgpreload_memcheck-x86-linux.so + memalign + /build/buildd/valgrind-3.6.1/coregrind/m_replacemalloc + vg_replace_malloc.c + 581 + + + 0x40251D8 + /usr/lib/valgrind/vgpreload_memcheck-x86-linux.so + posix_memalign + /build/buildd/valgrind-3.6.1/coregrind/m_replacemalloc + vg_replace_malloc.c + 709 + + + 0x42BE546 + /lib/i386-linux-gnu/libglib-2.0.so.0.2800.6 + + + 0x42BFA4C + /lib/i386-linux-gnu/libglib-2.0.so.0.2800.6 + g_slice_alloc + + + 0x42C06DD + /lib/i386-linux-gnu/libglib-2.0.so.0.2800.6 + g_slist_prepend + + + 0x42C368E + /lib/i386-linux-gnu/libglib-2.0.so.0.2800.6 + g_strsplit + + + 0x42D9393 + /lib/i386-linux-gnu/libglib-2.0.so.0.2800.6 + g_get_language_names + + + 0x42D98E6 + /lib/i386-linux-gnu/libglib-2.0.so.0.2800.6 + + + 0x42CB919 + /lib/i386-linux-gnu/libglib-2.0.so.0.2800.6 + g_thread_init_glib + + + 0x4254506 + /usr/lib/i386-linux-gnu/libgthread-2.0.so.0.2800.6 + g_thread_init + + + 0x8D4D458 + /home/chris/untitled/untitled + QEventDispatcherGlibPrivate::QEventDispatcherGlibPrivate(_GMainContext*) + + + 0x85C7CA5 + /home/chris/untitled/untitled + QGuiEventDispatcherGlibPrivate::QGuiEventDispatcherGlibPrivate() + + + + + + 0x128 + 1 + Leak_DefinitelyLost + + 396 (256 direct, 140 indirect) bytes in 2 blocks are definitely lost in loss record 217 of 270 + 396 + 2 + + + + 0x4026864 + /usr/lib/valgrind/vgpreload_memcheck-x86-linux.so + malloc + /build/buildd/valgrind-3.6.1/coregrind/m_replacemalloc + vg_replace_malloc.c + 236 + + + 0x4086087 + /usr/lib/i386-linux-gnu/libfontconfig.so.1.4.4 + + + 0x4086F7C + /usr/lib/i386-linux-gnu/libfontconfig.so.1.4.4 + + + 0x4087073 + /usr/lib/i386-linux-gnu/libfontconfig.so.1.4.4 + + + 0x408C6EB + /usr/lib/i386-linux-gnu/libfontconfig.so.1.4.4 + + + 0x4607790 + /lib/i386-linux-gnu/libexpat.so.1.5.2 + + + 0x4608670 + /lib/i386-linux-gnu/libexpat.so.1.5.2 + + + 0x4608F92 + /lib/i386-linux-gnu/libexpat.so.1.5.2 + + + 0x460A7D9 + /lib/i386-linux-gnu/libexpat.so.1.5.2 + + + 0x460C5F2 + /lib/i386-linux-gnu/libexpat.so.1.5.2 + XML_ParseBuffer + + + 0x408B2B2 + /usr/lib/i386-linux-gnu/libfontconfig.so.1.4.4 + FcConfigParseAndLoad + + + 0x408B60B + /usr/lib/i386-linux-gnu/libfontconfig.so.1.4.4 + FcConfigParseAndLoad + + + + + + 0x144 + 1 + Leak_PossiblyLost + + 1,240 bytes in 5 blocks are possibly lost in loss record 245 of 270 + 1240 + 5 + + + + 0x402517B + /usr/lib/valgrind/vgpreload_memcheck-x86-linux.so + memalign + /build/buildd/valgrind-3.6.1/coregrind/m_replacemalloc + vg_replace_malloc.c + 581 + + + 0x40251D8 + /usr/lib/valgrind/vgpreload_memcheck-x86-linux.so + posix_memalign + /build/buildd/valgrind-3.6.1/coregrind/m_replacemalloc + vg_replace_malloc.c + 709 + + + 0x42BE546 + /lib/i386-linux-gnu/libglib-2.0.so.0.2800.6 + + + 0x42BFA4C + /lib/i386-linux-gnu/libglib-2.0.so.0.2800.6 + g_slice_alloc + + + 0x42729D8 + /lib/i386-linux-gnu/libglib-2.0.so.0.2800.6 + g_array_sized_new + + + 0x4272AB2 + /lib/i386-linux-gnu/libglib-2.0.so.0.2800.6 + g_array_new + + + 0x42CB7FE + /lib/i386-linux-gnu/libglib-2.0.so.0.2800.6 + g_static_private_set + + + 0x4282D0E + /lib/i386-linux-gnu/libglib-2.0.so.0.2800.6 + g_get_filename_charsets + + + 0x4282D9C + /lib/i386-linux-gnu/libglib-2.0.so.0.2800.6 + + + 0x42CB909 + /lib/i386-linux-gnu/libglib-2.0.so.0.2800.6 + g_thread_init_glib + + + 0x4254506 + /usr/lib/i386-linux-gnu/libgthread-2.0.so.0.2800.6 + g_thread_init + + + 0x8D4D458 + /home/chris/untitled/untitled + QEventDispatcherGlibPrivate::QEventDispatcherGlibPrivate(_GMainContext*) + + + + + + + + + + 80 + U1004-ARM-_dl_relocate_object + + + + + diff --git a/tests/valgrind/memcheck/memcheck.pro b/tests/auto/valgrind/memcheck/memcheck.pro similarity index 100% rename from tests/valgrind/memcheck/memcheck.pro rename to tests/auto/valgrind/memcheck/memcheck.pro diff --git a/tests/valgrind/memcheck/modeldemo.cpp b/tests/auto/valgrind/memcheck/modeldemo.cpp similarity index 96% rename from tests/valgrind/memcheck/modeldemo.cpp rename to tests/auto/valgrind/memcheck/modeldemo.cpp index cf0e66fd1b7..2c52ed30c02 100644 --- a/tests/valgrind/memcheck/modeldemo.cpp +++ b/tests/auto/valgrind/memcheck/modeldemo.cpp @@ -44,7 +44,7 @@ using namespace Valgrind::XmlProtocol; static QString fakeValgrindExecutable() { - return QCoreApplication::applicationDirPath() + QLatin1String("/../../valgrind-fake/valgrind-fake"); + return QLatin1String(VALGRIND_FAKE_PATH); } static QString dataFile(const QLatin1String &file) diff --git a/tests/valgrind/memcheck/modeldemo.h b/tests/auto/valgrind/memcheck/modeldemo.h similarity index 100% rename from tests/valgrind/memcheck/modeldemo.h rename to tests/auto/valgrind/memcheck/modeldemo.h diff --git a/tests/valgrind/memcheck/modeldemo.pro b/tests/auto/valgrind/memcheck/modeldemo.pro similarity index 61% rename from tests/valgrind/memcheck/modeldemo.pro rename to tests/auto/valgrind/memcheck/modeldemo.pro index 5ce312ede7b..24308f124ed 100644 --- a/tests/valgrind/memcheck/modeldemo.pro +++ b/tests/auto/valgrind/memcheck/modeldemo.pro @@ -1,5 +1,6 @@ -include(../../../qtcreator.pri) -include(../../auto/qttestrpath.pri) +include(../../../../qtcreator.pri) +include(../../qttestrpath.pri) +include($$IDE_SOURCE_TREE/src/libs/3rdparty/botan/botan.pri) include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) include($$IDE_SOURCE_TREE/src/libs/ssh/ssh.pri) include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri) @@ -12,7 +13,7 @@ macx:CONFIG -= app_bundle QT += gui network DEFINES += "PARSERTESTS_DATA_DIR=\\\"$$PWD/data\\\"" - +DEFINES += "VALGRIND_FAKE_PATH=\\\"$$IDE_BUILD_TREE/src/tools/valgrindfake/valgrind-fake\\\"" SOURCES += modeldemo.cpp diff --git a/tests/valgrind/memcheck/parsertests.cpp b/tests/auto/valgrind/memcheck/parsertests.cpp similarity index 98% rename from tests/valgrind/memcheck/parsertests.cpp rename to tests/auto/valgrind/memcheck/parsertests.cpp index cf72a3f97f9..b665f9efc14 100644 --- a/tests/valgrind/memcheck/parsertests.cpp +++ b/tests/auto/valgrind/memcheck/parsertests.cpp @@ -48,6 +48,12 @@ #include #include +#if QT_VERSION >= 0x050000 +#define MSKIP_SINGLE(x) QSKIP(x) +#else +#define MSKIP_SINGLE(x) QSKIP(x, SkipSingle) +#endif + using namespace Valgrind; using namespace Valgrind::XmlProtocol; @@ -143,6 +149,8 @@ void ParserTests::cleanup() void ParserTests::testHelgrindSample1() { + MSKIP_SINGLE("testfile does not exist"); + initTest(QLatin1String("helgrind-output-sample1.xml")); QList expectedErrors; @@ -313,6 +321,8 @@ void ParserTests::testMemcheckSample1() void ParserTests::testMemcheckSample2() { + MSKIP_SINGLE("testfile does not exist"); + initTest(QLatin1String("memcheck-output-sample2.xml")); Valgrind::XmlProtocol::Parser parser; @@ -337,6 +347,8 @@ void ParserTests::testMemcheckSample2() void ParserTests::testMemcheckSample3() { + MSKIP_SINGLE("testfile does not exist"); + initTest(QLatin1String("memcheck-output-sample3.xml")); Valgrind::XmlProtocol::Parser parser; @@ -387,8 +399,10 @@ void ParserTests::testMemcheckSample3() void ParserTests::testMemcheckCharm() { + MSKIP_SINGLE("testfile does not exist"); + // a somewhat larger file, to make sure buffering and partial I/O works ok - initTest(QLatin1String("memcheck-output-charm.xml")); + initTest(QLatin1String("memcheck-output-untitled.xml")); Valgrind::XmlProtocol::Parser parser; Recorder rec(&parser); diff --git a/tests/valgrind/memcheck/parsertests.h b/tests/auto/valgrind/memcheck/parsertests.h similarity index 98% rename from tests/valgrind/memcheck/parsertests.h rename to tests/auto/valgrind/memcheck/parsertests.h index 52c481cb70a..0059564cae5 100644 --- a/tests/valgrind/memcheck/parsertests.h +++ b/tests/auto/valgrind/memcheck/parsertests.h @@ -76,9 +76,9 @@ public Q_SLOTS: errors.append(err); } - void errorCount(qint64 uniq, qint64 count) + void errorCount(qint64 unique, qint64 count) { - errorcounts.push_back(qMakePair(uniq, count)); + errorcounts.push_back(qMakePair(unique, count)); } void suppressionCount(const QString &name, qint64 count) diff --git a/tests/valgrind/memcheck/parsertests.pro b/tests/auto/valgrind/memcheck/parsertests.pro similarity index 65% rename from tests/valgrind/memcheck/parsertests.pro rename to tests/auto/valgrind/memcheck/parsertests.pro index 8da114d90fe..d8faf95b4b8 100644 --- a/tests/valgrind/memcheck/parsertests.pro +++ b/tests/auto/valgrind/memcheck/parsertests.pro @@ -1,13 +1,14 @@ -include(../../auto/qttest.pri) +include(../../qttest.pri) +include($$IDE_SOURCE_TREE/src/libs/3rdparty/botan/botan.pri) include($$IDE_SOURCE_TREE/src/libs/ssh/ssh.pri) include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri) -TARGET = parsertests +TARGET = tst_parsertests QT += network -DEFINES += "PARSERTESTS_DATA_DIR=\\\"$$PWD/data\\\"" +DEFINES += "PARSERTESTS_DATA_DIR=\\\"$$_PRO_FILE_PWD_/data\\\"" DEFINES += "VALGRIND_FAKE_PATH=\\\"$$IDE_BUILD_TREE/src/tools/valgrindfake/valgrind-fake\\\"" SOURCES += parsertests.cpp diff --git a/tests/valgrind/memcheck/testapps/free1/free1.pro b/tests/auto/valgrind/memcheck/testapps/free1/free1.pro similarity index 100% rename from tests/valgrind/memcheck/testapps/free1/free1.pro rename to tests/auto/valgrind/memcheck/testapps/free1/free1.pro diff --git a/tests/valgrind/memcheck/testapps/free1/main.cpp b/tests/auto/valgrind/memcheck/testapps/free1/main.cpp similarity index 100% rename from tests/valgrind/memcheck/testapps/free1/main.cpp rename to tests/auto/valgrind/memcheck/testapps/free1/main.cpp diff --git a/tests/valgrind/memcheck/testapps/free2/free2.pro b/tests/auto/valgrind/memcheck/testapps/free2/free2.pro similarity index 100% rename from tests/valgrind/memcheck/testapps/free2/free2.pro rename to tests/auto/valgrind/memcheck/testapps/free2/free2.pro diff --git a/tests/valgrind/memcheck/testapps/free2/main.cpp b/tests/auto/valgrind/memcheck/testapps/free2/main.cpp similarity index 100% rename from tests/valgrind/memcheck/testapps/free2/main.cpp rename to tests/auto/valgrind/memcheck/testapps/free2/main.cpp diff --git a/tests/valgrind/memcheck/testapps/invalidjump/invalidjump.pro b/tests/auto/valgrind/memcheck/testapps/invalidjump/invalidjump.pro similarity index 100% rename from tests/valgrind/memcheck/testapps/invalidjump/invalidjump.pro rename to tests/auto/valgrind/memcheck/testapps/invalidjump/invalidjump.pro diff --git a/tests/valgrind/memcheck/testapps/invalidjump/main.cpp b/tests/auto/valgrind/memcheck/testapps/invalidjump/main.cpp similarity index 100% rename from tests/valgrind/memcheck/testapps/invalidjump/main.cpp rename to tests/auto/valgrind/memcheck/testapps/invalidjump/main.cpp diff --git a/tests/valgrind/memcheck/testapps/leak1/leak1.pro b/tests/auto/valgrind/memcheck/testapps/leak1/leak1.pro similarity index 100% rename from tests/valgrind/memcheck/testapps/leak1/leak1.pro rename to tests/auto/valgrind/memcheck/testapps/leak1/leak1.pro diff --git a/tests/valgrind/memcheck/testapps/leak1/main.cpp b/tests/auto/valgrind/memcheck/testapps/leak1/main.cpp similarity index 100% rename from tests/valgrind/memcheck/testapps/leak1/main.cpp rename to tests/auto/valgrind/memcheck/testapps/leak1/main.cpp diff --git a/tests/valgrind/memcheck/testapps/leak2/leak2.pro b/tests/auto/valgrind/memcheck/testapps/leak2/leak2.pro similarity index 100% rename from tests/valgrind/memcheck/testapps/leak2/leak2.pro rename to tests/auto/valgrind/memcheck/testapps/leak2/leak2.pro diff --git a/tests/valgrind/memcheck/testapps/leak2/main.cpp b/tests/auto/valgrind/memcheck/testapps/leak2/main.cpp similarity index 100% rename from tests/valgrind/memcheck/testapps/leak2/main.cpp rename to tests/auto/valgrind/memcheck/testapps/leak2/main.cpp diff --git a/tests/valgrind/memcheck/testapps/leak3/leak3.pro b/tests/auto/valgrind/memcheck/testapps/leak3/leak3.pro similarity index 100% rename from tests/valgrind/memcheck/testapps/leak3/leak3.pro rename to tests/auto/valgrind/memcheck/testapps/leak3/leak3.pro diff --git a/tests/valgrind/memcheck/testapps/leak3/main.cpp b/tests/auto/valgrind/memcheck/testapps/leak3/main.cpp similarity index 100% rename from tests/valgrind/memcheck/testapps/leak3/main.cpp rename to tests/auto/valgrind/memcheck/testapps/leak3/main.cpp diff --git a/tests/valgrind/memcheck/testapps/leak4/leak4.pro b/tests/auto/valgrind/memcheck/testapps/leak4/leak4.pro similarity index 100% rename from tests/valgrind/memcheck/testapps/leak4/leak4.pro rename to tests/auto/valgrind/memcheck/testapps/leak4/leak4.pro diff --git a/tests/valgrind/memcheck/testapps/leak4/main.cpp b/tests/auto/valgrind/memcheck/testapps/leak4/main.cpp similarity index 100% rename from tests/valgrind/memcheck/testapps/leak4/main.cpp rename to tests/auto/valgrind/memcheck/testapps/leak4/main.cpp diff --git a/tests/valgrind/memcheck/testapps/overlap/main.cpp b/tests/auto/valgrind/memcheck/testapps/overlap/main.cpp similarity index 100% rename from tests/valgrind/memcheck/testapps/overlap/main.cpp rename to tests/auto/valgrind/memcheck/testapps/overlap/main.cpp diff --git a/tests/valgrind/memcheck/testapps/overlap/overlap.pro b/tests/auto/valgrind/memcheck/testapps/overlap/overlap.pro similarity index 100% rename from tests/valgrind/memcheck/testapps/overlap/overlap.pro rename to tests/auto/valgrind/memcheck/testapps/overlap/overlap.pro diff --git a/tests/valgrind/memcheck/testapps/syscall/main.cpp b/tests/auto/valgrind/memcheck/testapps/syscall/main.cpp similarity index 100% rename from tests/valgrind/memcheck/testapps/syscall/main.cpp rename to tests/auto/valgrind/memcheck/testapps/syscall/main.cpp diff --git a/tests/valgrind/memcheck/testapps/syscall/syscall.pro b/tests/auto/valgrind/memcheck/testapps/syscall/syscall.pro similarity index 100% rename from tests/valgrind/memcheck/testapps/syscall/syscall.pro rename to tests/auto/valgrind/memcheck/testapps/syscall/syscall.pro diff --git a/tests/valgrind/memcheck/testapps/testapps.pro b/tests/auto/valgrind/memcheck/testapps/testapps.pro similarity index 100% rename from tests/valgrind/memcheck/testapps/testapps.pro rename to tests/auto/valgrind/memcheck/testapps/testapps.pro diff --git a/tests/valgrind/memcheck/testapps/uninit1/main.cpp b/tests/auto/valgrind/memcheck/testapps/uninit1/main.cpp similarity index 100% rename from tests/valgrind/memcheck/testapps/uninit1/main.cpp rename to tests/auto/valgrind/memcheck/testapps/uninit1/main.cpp diff --git a/tests/valgrind/memcheck/testapps/uninit1/uninit1.pro b/tests/auto/valgrind/memcheck/testapps/uninit1/uninit1.pro similarity index 100% rename from tests/valgrind/memcheck/testapps/uninit1/uninit1.pro rename to tests/auto/valgrind/memcheck/testapps/uninit1/uninit1.pro diff --git a/tests/valgrind/memcheck/testapps/uninit2/main.cpp b/tests/auto/valgrind/memcheck/testapps/uninit2/main.cpp similarity index 100% rename from tests/valgrind/memcheck/testapps/uninit2/main.cpp rename to tests/auto/valgrind/memcheck/testapps/uninit2/main.cpp diff --git a/tests/valgrind/memcheck/testapps/uninit2/uninit2.pro b/tests/auto/valgrind/memcheck/testapps/uninit2/uninit2.pro similarity index 100% rename from tests/valgrind/memcheck/testapps/uninit2/uninit2.pro rename to tests/auto/valgrind/memcheck/testapps/uninit2/uninit2.pro diff --git a/tests/valgrind/memcheck/testapps/uninit3/main.cpp b/tests/auto/valgrind/memcheck/testapps/uninit3/main.cpp similarity index 100% rename from tests/valgrind/memcheck/testapps/uninit3/main.cpp rename to tests/auto/valgrind/memcheck/testapps/uninit3/main.cpp diff --git a/tests/valgrind/memcheck/testapps/uninit3/uninit3.pro b/tests/auto/valgrind/memcheck/testapps/uninit3/uninit3.pro similarity index 100% rename from tests/valgrind/memcheck/testapps/uninit3/uninit3.pro rename to tests/auto/valgrind/memcheck/testapps/uninit3/uninit3.pro diff --git a/tests/valgrind/memcheck/testrunner.cpp b/tests/auto/valgrind/memcheck/testrunner.cpp similarity index 99% rename from tests/valgrind/memcheck/testrunner.cpp rename to tests/auto/valgrind/memcheck/testrunner.cpp index d445d3bdfe0..0bd1f9656bd 100644 --- a/tests/valgrind/memcheck/testrunner.cpp +++ b/tests/auto/valgrind/memcheck/testrunner.cpp @@ -56,7 +56,7 @@ using namespace Valgrind; using namespace Valgrind::XmlProtocol; using namespace Valgrind::Memcheck; -//BEGIN Test Helpers and boilterplate code +//BEGIN Test Helpers and boilerplate code TestRunner::TestRunner(QObject *parent) : QObject(parent), diff --git a/tests/valgrind/memcheck/testrunner.h b/tests/auto/valgrind/memcheck/testrunner.h similarity index 100% rename from tests/valgrind/memcheck/testrunner.h rename to tests/auto/valgrind/memcheck/testrunner.h diff --git a/tests/valgrind/memcheck/testrunner.pro b/tests/auto/valgrind/memcheck/testrunner.pro similarity index 86% rename from tests/valgrind/memcheck/testrunner.pro rename to tests/auto/valgrind/memcheck/testrunner.pro index acfa3a20476..8e52ade154e 100644 --- a/tests/valgrind/memcheck/testrunner.pro +++ b/tests/auto/valgrind/memcheck/testrunner.pro @@ -1,9 +1,9 @@ -include(../../auto/qttest.pri) +include(../../qttest.pri) include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri) include($$IDE_SOURCE_TREE/src/libs/ssh/ssh.pri) include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri) -TARGET = testrunner +TARGET = tst_testrunner DEFINES += "TESTRUNNER_SRC_DIR=\\\"$$_PRO_FILE_PWD_/testapps\\\"" DEFINES += "TESTRUNNER_APP_DIR=\\\"$(PWD)/testapps\\\"" diff --git a/tests/valgrind/valgrind.pro b/tests/auto/valgrind/valgrind.pro similarity index 100% rename from tests/valgrind/valgrind.pro rename to tests/auto/valgrind/valgrind.pro