diff --git a/src/libs/extensionsystem/test/extensionsystem_test.pri b/src/libs/extensionsystem/test/extensionsystem_test.pri deleted file mode 100644 index a3a33c36d21b438135025f1acae8e45bd626a9e4..0000000000000000000000000000000000000000 --- a/src/libs/extensionsystem/test/extensionsystem_test.pri +++ /dev/null @@ -1,27 +0,0 @@ -RELATIVEPATH = $$RELATIVEPATH/../../../.. -INCLUDEPATH *= $$PWD/../.. -macx { - LIBS += -L"$$OUT_PWD/$$RELATIVEPATH/bin/Qt Creator.app/Contents/PlugIns" -} -else { - LIBS += $$OUT_PWD/$$RELATIVEPATH/lib -} - -# stolen from qtcreator.pri -defineReplace(qtLibraryName) { - unset(LIBRARY_NAME) - LIBRARY_NAME = $$1 - CONFIG(debug, debug|release) { - !debug_and_release|build_pass { - mac:RET = $$member(LIBRARY_NAME, 0)_debug - else:win32:RET = $$member(LIBRARY_NAME, 0)d - } - } - isEmpty(RET):RET = $$LIBRARY_NAME - return($$RET) -} - -include(../extensionsystem.pri) - -QT *= xml - diff --git a/src/libs/extensionsystem/test/auto/copy.pri b/tests/auto/extensionsystem/copy.pri similarity index 100% rename from src/libs/extensionsystem/test/auto/copy.pri rename to tests/auto/extensionsystem/copy.pri diff --git a/src/libs/extensionsystem/test/auto/auto.pro b/tests/auto/extensionsystem/extensionsystem.pro similarity index 100% rename from src/libs/extensionsystem/test/auto/auto.pro rename to tests/auto/extensionsystem/extensionsystem.pro diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/circularplugins.pro b/tests/auto/extensionsystem/pluginmanager/circularplugins/circularplugins.pro similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/circularplugins.pro rename to tests/auto/extensionsystem/pluginmanager/circularplugins/circularplugins.pro diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin.xml b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin.xml similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin.xml rename to tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin.xml diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin1.cpp b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.cpp similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin1.cpp rename to tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.cpp diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin1.h b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.h similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin1.h rename to tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.h diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin1.pro b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.pro similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin1/plugin1.pro rename to tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.pro diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin.xml b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin.xml similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin.xml rename to tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin.xml diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin2.cpp b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.cpp similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin2.cpp rename to tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.cpp diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin2.h b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin2.h rename to tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.h diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin2.pro b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.pro similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin2/plugin2.pro rename to tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.pro diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin3/plugin.xml b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin.xml similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin3/plugin.xml rename to tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin.xml diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin3/plugin3.cpp b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.cpp similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin3/plugin3.cpp rename to tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.cpp diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin3/plugin3.h b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.h similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin3/plugin3.h rename to tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.h diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin3/plugin3.pro b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.pro similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/circularplugins/plugin3/plugin3.pro rename to tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.pro diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/correctplugins1.pro b/tests/auto/extensionsystem/pluginmanager/correctplugins1/correctplugins1.pro similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/correctplugins1.pro rename to tests/auto/extensionsystem/pluginmanager/correctplugins1/correctplugins1.pro diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin.spec b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin.spec similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin.spec rename to tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin.spec diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin1.cpp b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.cpp similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin1.cpp rename to tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.cpp diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin1.h b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.h similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin1.h rename to tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.h diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin1.pro b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.pro similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin1/plugin1.pro rename to tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.pro diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin.spec b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin.spec similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin.spec rename to tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin.spec diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin2.cpp b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.cpp similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin2.cpp rename to tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.cpp diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin2.h b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.h similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin2.h rename to tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.h diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin2.pro b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.pro similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin2/plugin2.pro rename to tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.pro diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin.spec b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin.spec similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin.spec rename to tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin.spec diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin3.cpp b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.cpp similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin3.cpp rename to tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.cpp diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin3.h b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.h similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin3.h rename to tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.h diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin3.pro b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.pro similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/correctplugins1/plugin3/plugin3.pro rename to tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.pro diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/pluginmanager.pro b/tests/auto/extensionsystem/pluginmanager/pluginmanager.pro similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/pluginmanager.pro rename to tests/auto/extensionsystem/pluginmanager/pluginmanager.pro diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/plugins/myplug/myplug.xml b/tests/auto/extensionsystem/pluginmanager/plugins/myplug/myplug.xml similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/plugins/myplug/myplug.xml rename to tests/auto/extensionsystem/pluginmanager/plugins/myplug/myplug.xml diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/plugins/otherplugin.xml b/tests/auto/extensionsystem/pluginmanager/plugins/otherplugin.xml similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/plugins/otherplugin.xml rename to tests/auto/extensionsystem/pluginmanager/plugins/otherplugin.xml diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/plugins/plugin1.xml b/tests/auto/extensionsystem/pluginmanager/plugins/plugin1.xml similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/plugins/plugin1.xml rename to tests/auto/extensionsystem/pluginmanager/plugins/plugin1.xml diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/test.pro b/tests/auto/extensionsystem/pluginmanager/test.pro similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/test.pro rename to tests/auto/extensionsystem/pluginmanager/test.pro diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/test.sh b/tests/auto/extensionsystem/pluginmanager/test.sh similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/test.sh rename to tests/auto/extensionsystem/pluginmanager/test.sh diff --git a/src/libs/extensionsystem/test/auto/pluginmanager/tst_pluginmanager.cpp b/tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginmanager/tst_pluginmanager.cpp rename to tests/auto/extensionsystem/pluginmanager/tst_pluginmanager.cpp diff --git a/src/libs/extensionsystem/test/auto/pluginspec/pluginspec.pro b/tests/auto/extensionsystem/pluginspec/pluginspec.pro similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginspec/pluginspec.pro rename to tests/auto/extensionsystem/pluginspec/pluginspec.pro diff --git a/src/libs/extensionsystem/test/auto/pluginspec/test.pro b/tests/auto/extensionsystem/pluginspec/test.pro similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginspec/test.pro rename to tests/auto/extensionsystem/pluginspec/test.pro diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testdependencies/spec1.xml b/tests/auto/extensionsystem/pluginspec/testdependencies/spec1.xml similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginspec/testdependencies/spec1.xml rename to tests/auto/extensionsystem/pluginspec/testdependencies/spec1.xml diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testdependencies/spec2.xml b/tests/auto/extensionsystem/pluginspec/testdependencies/spec2.xml similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginspec/testdependencies/spec2.xml rename to tests/auto/extensionsystem/pluginspec/testdependencies/spec2.xml diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testdependencies/spec3.xml b/tests/auto/extensionsystem/pluginspec/testdependencies/spec3.xml similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginspec/testdependencies/spec3.xml rename to tests/auto/extensionsystem/pluginspec/testdependencies/spec3.xml diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testdependencies/spec4.xml b/tests/auto/extensionsystem/pluginspec/testdependencies/spec4.xml similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginspec/testdependencies/spec4.xml rename to tests/auto/extensionsystem/pluginspec/testdependencies/spec4.xml diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testdependencies/spec5.xml b/tests/auto/extensionsystem/pluginspec/testdependencies/spec5.xml similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginspec/testdependencies/spec5.xml rename to tests/auto/extensionsystem/pluginspec/testdependencies/spec5.xml diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testdir/spec.xml b/tests/auto/extensionsystem/pluginspec/testdir/spec.xml similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginspec/testdir/spec.xml rename to tests/auto/extensionsystem/pluginspec/testdir/spec.xml diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.cpp b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.cpp similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.cpp rename to tests/auto/extensionsystem/pluginspec/testplugin/testplugin.cpp diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.h b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.h similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.h rename to tests/auto/extensionsystem/pluginspec/testplugin/testplugin.h diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.pro b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.pro similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.pro rename to tests/auto/extensionsystem/pluginspec/testplugin/testplugin.pro diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.xml b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.xml similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin.xml rename to tests/auto/extensionsystem/pluginspec/testplugin/testplugin.xml diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin_global.h b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin_global.h similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginspec/testplugin/testplugin_global.h rename to tests/auto/extensionsystem/pluginspec/testplugin/testplugin_global.h diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testspecs/simplespec.xml b/tests/auto/extensionsystem/pluginspec/testspecs/simplespec.xml similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginspec/testspecs/simplespec.xml rename to tests/auto/extensionsystem/pluginspec/testspecs/simplespec.xml diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testspecs/simplespec_experimental.xml b/tests/auto/extensionsystem/pluginspec/testspecs/simplespec_experimental.xml similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginspec/testspecs/simplespec_experimental.xml rename to tests/auto/extensionsystem/pluginspec/testspecs/simplespec_experimental.xml diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec1.xml b/tests/auto/extensionsystem/pluginspec/testspecs/spec1.xml similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec1.xml rename to tests/auto/extensionsystem/pluginspec/testspecs/spec1.xml diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec2.xml b/tests/auto/extensionsystem/pluginspec/testspecs/spec2.xml similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec2.xml rename to tests/auto/extensionsystem/pluginspec/testspecs/spec2.xml diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec_wrong1.xml b/tests/auto/extensionsystem/pluginspec/testspecs/spec_wrong1.xml similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec_wrong1.xml rename to tests/auto/extensionsystem/pluginspec/testspecs/spec_wrong1.xml diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec_wrong2.xml b/tests/auto/extensionsystem/pluginspec/testspecs/spec_wrong2.xml similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec_wrong2.xml rename to tests/auto/extensionsystem/pluginspec/testspecs/spec_wrong2.xml diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec_wrong3.xml b/tests/auto/extensionsystem/pluginspec/testspecs/spec_wrong3.xml similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec_wrong3.xml rename to tests/auto/extensionsystem/pluginspec/testspecs/spec_wrong3.xml diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec_wrong4.xml b/tests/auto/extensionsystem/pluginspec/testspecs/spec_wrong4.xml similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec_wrong4.xml rename to tests/auto/extensionsystem/pluginspec/testspecs/spec_wrong4.xml diff --git a/src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec_wrong5.xml b/tests/auto/extensionsystem/pluginspec/testspecs/spec_wrong5.xml similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginspec/testspecs/spec_wrong5.xml rename to tests/auto/extensionsystem/pluginspec/testspecs/spec_wrong5.xml diff --git a/src/libs/extensionsystem/test/auto/pluginspec/tst_pluginspec.cpp b/tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp similarity index 100% rename from src/libs/extensionsystem/test/auto/pluginspec/tst_pluginspec.cpp rename to tests/auto/extensionsystem/pluginspec/tst_pluginspec.cpp