From 051545a499ea402f8444e000529818db3d61a409 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 23 Aug 2011 12:47:30 +0200 Subject: [PATCH] debugger: rename manual tests from 'gdbdebugger' to 'debugger' Change-Id: I0f92b03fa99d81fd58d92eb8a0f3dfe3b1cbf7b4 Reviewed-on: http://codereview.qt.nokia.com/3402 Reviewed-by: hjk --- .../manual/{gdbdebugger => debugger}/boost/boost.pro | 0 .../manual/{gdbdebugger => debugger}/boost/main.cpp | 0 .../manual/{gdbdebugger => debugger}/gdbdebugger.pro | 0 tests/manual/{gdbdebugger => debugger}/gui/gui.pro | 0 .../{gdbdebugger => debugger}/gui/mainwindow.cpp | 0 .../{gdbdebugger => debugger}/gui/mainwindow.h | 0 .../{gdbdebugger => debugger}/gui/mainwindow.ui | 0 .../manual/{gdbdebugger => debugger}/gui/tst_gui.cpp | 0 .../{gdbdebugger => debugger}/helper/helper.pro | 0 .../manual/{gdbdebugger => debugger}/helper/main.cpp | 0 .../manual/{gdbdebugger => debugger}/python/math.py | 0 .../{gdbdebugger => debugger}/python/python.pro | 0 .../manual/{gdbdebugger => debugger}/script/math.js | 0 .../{gdbdebugger => debugger}/script/script.pro | 0 tests/manual/{gdbdebugger => debugger}/simple/README | 0 .../simple/deep/deep/simple_test_app.h} | 0 tests/manual/debugger/simple/simple.pro | 4 ++++ .../simple/simple_test_app.cpp} | 12 ++++++------ .../simple/simple_test_app.pro} | 4 ++-- .../simple/simple_test_plugin.cpp} | 0 .../simple/simple_test_plugin.pro} | 5 ++--- .../spacy path/app with space.cpp | 0 .../spacy path/plugin with space.cpp | 0 .../spacy path/spacy app/spacy app.pro | 0 .../spacy path/spacy path.pro | 0 .../spacy path/spacy plugin/spacy plugin.pro | 0 .../spacy-file/app with space.cpp | 0 .../{gdbdebugger => debugger}/spacy-file/app/app.pro | 0 .../spacy-file/plugin with space.cpp | 0 .../spacy-file/plugin/plugin.pro | 0 .../spacy-file/spacy-file.pro | 0 tests/manual/gdbdebugger/simple/simple.pro | 4 ---- 32 files changed, 14 insertions(+), 15 deletions(-) rename tests/manual/{gdbdebugger => debugger}/boost/boost.pro (100%) rename tests/manual/{gdbdebugger => debugger}/boost/main.cpp (100%) rename tests/manual/{gdbdebugger => debugger}/gdbdebugger.pro (100%) rename tests/manual/{gdbdebugger => debugger}/gui/gui.pro (100%) rename tests/manual/{gdbdebugger => debugger}/gui/mainwindow.cpp (100%) rename tests/manual/{gdbdebugger => debugger}/gui/mainwindow.h (100%) rename tests/manual/{gdbdebugger => debugger}/gui/mainwindow.ui (100%) rename tests/manual/{gdbdebugger => debugger}/gui/tst_gui.cpp (100%) rename tests/manual/{gdbdebugger => debugger}/helper/helper.pro (100%) rename tests/manual/{gdbdebugger => debugger}/helper/main.cpp (100%) rename tests/manual/{gdbdebugger => debugger}/python/math.py (100%) rename tests/manual/{gdbdebugger => debugger}/python/python.pro (100%) rename tests/manual/{gdbdebugger => debugger}/script/math.js (100%) rename tests/manual/{gdbdebugger => debugger}/script/script.pro (100%) rename tests/manual/{gdbdebugger => debugger}/simple/README (100%) rename tests/manual/{gdbdebugger/simple/deep/deep/simple_gdbtest_app.h => debugger/simple/deep/deep/simple_test_app.h} (100%) create mode 100644 tests/manual/debugger/simple/simple.pro rename tests/manual/{gdbdebugger/simple/simple_gdbtest_app.cpp => debugger/simple/simple_test_app.cpp} (99%) rename tests/manual/{gdbdebugger/simple/simple_gdbtest_app.pro => debugger/simple/simple_test_app.pro} (80%) rename tests/manual/{gdbdebugger/simple/simple_gdbtest_plugin.cpp => debugger/simple/simple_test_plugin.cpp} (100%) rename tests/manual/{gdbdebugger/simple/simple_gdbtest_plugin.pro => debugger/simple/simple_test_plugin.pro} (86%) rename tests/manual/{gdbdebugger => debugger}/spacy path/app with space.cpp (100%) rename tests/manual/{gdbdebugger => debugger}/spacy path/plugin with space.cpp (100%) rename tests/manual/{gdbdebugger => debugger}/spacy path/spacy app/spacy app.pro (100%) rename tests/manual/{gdbdebugger => debugger}/spacy path/spacy path.pro (100%) rename tests/manual/{gdbdebugger => debugger}/spacy path/spacy plugin/spacy plugin.pro (100%) rename tests/manual/{gdbdebugger => debugger}/spacy-file/app with space.cpp (100%) rename tests/manual/{gdbdebugger => debugger}/spacy-file/app/app.pro (100%) rename tests/manual/{gdbdebugger => debugger}/spacy-file/plugin with space.cpp (100%) rename tests/manual/{gdbdebugger => debugger}/spacy-file/plugin/plugin.pro (100%) rename tests/manual/{gdbdebugger => debugger}/spacy-file/spacy-file.pro (100%) delete mode 100644 tests/manual/gdbdebugger/simple/simple.pro diff --git a/tests/manual/gdbdebugger/boost/boost.pro b/tests/manual/debugger/boost/boost.pro similarity index 100% rename from tests/manual/gdbdebugger/boost/boost.pro rename to tests/manual/debugger/boost/boost.pro diff --git a/tests/manual/gdbdebugger/boost/main.cpp b/tests/manual/debugger/boost/main.cpp similarity index 100% rename from tests/manual/gdbdebugger/boost/main.cpp rename to tests/manual/debugger/boost/main.cpp diff --git a/tests/manual/gdbdebugger/gdbdebugger.pro b/tests/manual/debugger/gdbdebugger.pro similarity index 100% rename from tests/manual/gdbdebugger/gdbdebugger.pro rename to tests/manual/debugger/gdbdebugger.pro diff --git a/tests/manual/gdbdebugger/gui/gui.pro b/tests/manual/debugger/gui/gui.pro similarity index 100% rename from tests/manual/gdbdebugger/gui/gui.pro rename to tests/manual/debugger/gui/gui.pro diff --git a/tests/manual/gdbdebugger/gui/mainwindow.cpp b/tests/manual/debugger/gui/mainwindow.cpp similarity index 100% rename from tests/manual/gdbdebugger/gui/mainwindow.cpp rename to tests/manual/debugger/gui/mainwindow.cpp diff --git a/tests/manual/gdbdebugger/gui/mainwindow.h b/tests/manual/debugger/gui/mainwindow.h similarity index 100% rename from tests/manual/gdbdebugger/gui/mainwindow.h rename to tests/manual/debugger/gui/mainwindow.h diff --git a/tests/manual/gdbdebugger/gui/mainwindow.ui b/tests/manual/debugger/gui/mainwindow.ui similarity index 100% rename from tests/manual/gdbdebugger/gui/mainwindow.ui rename to tests/manual/debugger/gui/mainwindow.ui diff --git a/tests/manual/gdbdebugger/gui/tst_gui.cpp b/tests/manual/debugger/gui/tst_gui.cpp similarity index 100% rename from tests/manual/gdbdebugger/gui/tst_gui.cpp rename to tests/manual/debugger/gui/tst_gui.cpp diff --git a/tests/manual/gdbdebugger/helper/helper.pro b/tests/manual/debugger/helper/helper.pro similarity index 100% rename from tests/manual/gdbdebugger/helper/helper.pro rename to tests/manual/debugger/helper/helper.pro diff --git a/tests/manual/gdbdebugger/helper/main.cpp b/tests/manual/debugger/helper/main.cpp similarity index 100% rename from tests/manual/gdbdebugger/helper/main.cpp rename to tests/manual/debugger/helper/main.cpp diff --git a/tests/manual/gdbdebugger/python/math.py b/tests/manual/debugger/python/math.py similarity index 100% rename from tests/manual/gdbdebugger/python/math.py rename to tests/manual/debugger/python/math.py diff --git a/tests/manual/gdbdebugger/python/python.pro b/tests/manual/debugger/python/python.pro similarity index 100% rename from tests/manual/gdbdebugger/python/python.pro rename to tests/manual/debugger/python/python.pro diff --git a/tests/manual/gdbdebugger/script/math.js b/tests/manual/debugger/script/math.js similarity index 100% rename from tests/manual/gdbdebugger/script/math.js rename to tests/manual/debugger/script/math.js diff --git a/tests/manual/gdbdebugger/script/script.pro b/tests/manual/debugger/script/script.pro similarity index 100% rename from tests/manual/gdbdebugger/script/script.pro rename to tests/manual/debugger/script/script.pro diff --git a/tests/manual/gdbdebugger/simple/README b/tests/manual/debugger/simple/README similarity index 100% rename from tests/manual/gdbdebugger/simple/README rename to tests/manual/debugger/simple/README diff --git a/tests/manual/gdbdebugger/simple/deep/deep/simple_gdbtest_app.h b/tests/manual/debugger/simple/deep/deep/simple_test_app.h similarity index 100% rename from tests/manual/gdbdebugger/simple/deep/deep/simple_gdbtest_app.h rename to tests/manual/debugger/simple/deep/deep/simple_test_app.h diff --git a/tests/manual/debugger/simple/simple.pro b/tests/manual/debugger/simple/simple.pro new file mode 100644 index 00000000000..e6dbd0c35cd --- /dev/null +++ b/tests/manual/debugger/simple/simple.pro @@ -0,0 +1,4 @@ + +TEMPLATE = subdirs + +SUBDIRS += simple_test_app.pro simple_test_plugin.pro diff --git a/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp b/tests/manual/debugger/simple/simple_test_app.cpp similarity index 99% rename from tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp rename to tests/manual/debugger/simple/simple_test_app.cpp index 3818315b9f6..3ea43159466 100644 --- a/tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp +++ b/tests/manual/debugger/simple/simple_test_app.cpp @@ -36,7 +36,7 @@ void dummyStatement(...) {} -#include "../simple/deep/deep/simple_gdbtest_app.h" +#include "../simple/deep/deep/simple_test_app.h" #include #include @@ -1197,17 +1197,17 @@ void testPlugin() { QString dir = QDir::currentPath(); #ifdef Q_OS_LINUX - QLibrary lib(dir + "/libsimple_gdbtest_plugin.so"); + QLibrary lib(dir + "/libsimple_test_plugin.so"); #endif #ifdef Q_OS_MAC dir = QFileInfo(dir + "/../..").canonicalPath(); - QLibrary lib(dir + "/libsimple_gdbtest_plugin.dylib"); + QLibrary lib(dir + "/libsimple_test_plugin.dylib"); #endif #ifdef Q_OS_WIN - QLibrary lib(dir + "/debug/simple_gdbtest_plugin.dll"); + QLibrary lib(dir + "/debug/simple_test_plugin.dll"); #endif #ifdef Q_OS_SYMBIAN - QLibrary lib(dir + "/libsimple_gdbtest_plugin.dll"); + QLibrary lib(dir + "/libsimple_test_plugin.dll"); #endif int (*foo)() = (int(*)()) lib.resolve("pluginTest"); qDebug() << "library resolve: " << foo << lib.fileName(); @@ -3629,4 +3629,4 @@ int main(int argc, char *argv[]) return 0; } -#include "simple_gdbtest_app.moc" +#include "simple_test_app.moc" diff --git a/tests/manual/gdbdebugger/simple/simple_gdbtest_app.pro b/tests/manual/debugger/simple/simple_test_app.pro similarity index 80% rename from tests/manual/gdbdebugger/simple/simple_gdbtest_app.pro rename to tests/manual/debugger/simple/simple_test_app.pro index 5215b43b6d6..303163e8c0d 100644 --- a/tests/manual/gdbdebugger/simple/simple_gdbtest_app.pro +++ b/tests/manual/debugger/simple/simple_test_app.pro @@ -1,10 +1,10 @@ TEMPLATE = app -TARGET = simple_gdbtest_app +TARGET = simple_test_app DEPENDPATH += . INCLUDEPATH += . DESTDIR = . -SOURCES += simple_gdbtest_app.cpp +SOURCES += simple_test_app.cpp QT += network QT += script diff --git a/tests/manual/gdbdebugger/simple/simple_gdbtest_plugin.cpp b/tests/manual/debugger/simple/simple_test_plugin.cpp similarity index 100% rename from tests/manual/gdbdebugger/simple/simple_gdbtest_plugin.cpp rename to tests/manual/debugger/simple/simple_test_plugin.cpp diff --git a/tests/manual/gdbdebugger/simple/simple_gdbtest_plugin.pro b/tests/manual/debugger/simple/simple_test_plugin.pro similarity index 86% rename from tests/manual/gdbdebugger/simple/simple_gdbtest_plugin.pro rename to tests/manual/debugger/simple/simple_test_plugin.pro index a727dbb570f..79f68a60c6b 100644 --- a/tests/manual/gdbdebugger/simple/simple_gdbtest_plugin.pro +++ b/tests/manual/debugger/simple/simple_test_plugin.pro @@ -1,9 +1,8 @@ TEMPLATE = lib -TARGET = simple_gdbtest_plugin +TARGET = simple_test_plugin CONFIG += shared -SOURCES += \ - simple_gdbtest_plugin.cpp +SOURCES += simple_test_plugin.cpp macx { QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../PlugIns/$${PROVIDER}/ diff --git a/tests/manual/gdbdebugger/spacy path/app with space.cpp b/tests/manual/debugger/spacy path/app with space.cpp similarity index 100% rename from tests/manual/gdbdebugger/spacy path/app with space.cpp rename to tests/manual/debugger/spacy path/app with space.cpp diff --git a/tests/manual/gdbdebugger/spacy path/plugin with space.cpp b/tests/manual/debugger/spacy path/plugin with space.cpp similarity index 100% rename from tests/manual/gdbdebugger/spacy path/plugin with space.cpp rename to tests/manual/debugger/spacy path/plugin with space.cpp diff --git a/tests/manual/gdbdebugger/spacy path/spacy app/spacy app.pro b/tests/manual/debugger/spacy path/spacy app/spacy app.pro similarity index 100% rename from tests/manual/gdbdebugger/spacy path/spacy app/spacy app.pro rename to tests/manual/debugger/spacy path/spacy app/spacy app.pro diff --git a/tests/manual/gdbdebugger/spacy path/spacy path.pro b/tests/manual/debugger/spacy path/spacy path.pro similarity index 100% rename from tests/manual/gdbdebugger/spacy path/spacy path.pro rename to tests/manual/debugger/spacy path/spacy path.pro diff --git a/tests/manual/gdbdebugger/spacy path/spacy plugin/spacy plugin.pro b/tests/manual/debugger/spacy path/spacy plugin/spacy plugin.pro similarity index 100% rename from tests/manual/gdbdebugger/spacy path/spacy plugin/spacy plugin.pro rename to tests/manual/debugger/spacy path/spacy plugin/spacy plugin.pro diff --git a/tests/manual/gdbdebugger/spacy-file/app with space.cpp b/tests/manual/debugger/spacy-file/app with space.cpp similarity index 100% rename from tests/manual/gdbdebugger/spacy-file/app with space.cpp rename to tests/manual/debugger/spacy-file/app with space.cpp diff --git a/tests/manual/gdbdebugger/spacy-file/app/app.pro b/tests/manual/debugger/spacy-file/app/app.pro similarity index 100% rename from tests/manual/gdbdebugger/spacy-file/app/app.pro rename to tests/manual/debugger/spacy-file/app/app.pro diff --git a/tests/manual/gdbdebugger/spacy-file/plugin with space.cpp b/tests/manual/debugger/spacy-file/plugin with space.cpp similarity index 100% rename from tests/manual/gdbdebugger/spacy-file/plugin with space.cpp rename to tests/manual/debugger/spacy-file/plugin with space.cpp diff --git a/tests/manual/gdbdebugger/spacy-file/plugin/plugin.pro b/tests/manual/debugger/spacy-file/plugin/plugin.pro similarity index 100% rename from tests/manual/gdbdebugger/spacy-file/plugin/plugin.pro rename to tests/manual/debugger/spacy-file/plugin/plugin.pro diff --git a/tests/manual/gdbdebugger/spacy-file/spacy-file.pro b/tests/manual/debugger/spacy-file/spacy-file.pro similarity index 100% rename from tests/manual/gdbdebugger/spacy-file/spacy-file.pro rename to tests/manual/debugger/spacy-file/spacy-file.pro diff --git a/tests/manual/gdbdebugger/simple/simple.pro b/tests/manual/gdbdebugger/simple/simple.pro deleted file mode 100644 index 91ae291a466..00000000000 --- a/tests/manual/gdbdebugger/simple/simple.pro +++ /dev/null @@ -1,4 +0,0 @@ - -TEMPLATE = subdirs - -SUBDIRS += simple_gdbtest_app.pro simple_gdbtest_plugin.pro