Make extension system tests work in new location

12 files changed, 38 insertions, 42 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 75a7580b8d..b939543da4 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -5,6 +5,7 @@ SUBDIRS += \
     changeset \
     cplusplus \
     debugger \
+    extensionsystem \
     fakevim \
     generichighlighter \
 #    icheckbuild \
diff --git a/tests/auto/extensionsystem/copy.pri b/tests/auto/extensionsystem/copy.pri
index a24fc8f940..9dc7f8dbd0 100644
--- a/tests/auto/extensionsystem/copy.pri
+++ b/tests/auto/extensionsystem/copy.pri
@@ -1,11 +1,12 @@
 #set COPYFILES and COPYDIR
-
-# stolen from qtcreatorplugin.pri
-copy2build.input = COPYFILES
-copy2build.output = $$COPYDIR/${QMAKE_FUNC_FILE_IN_stripSrcDir}
-isEmpty(vcproj):copy2build.variable_out = PRE_TARGETDEPS
-copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-copy2build.name = COPY ${QMAKE_FILE_IN}
-copy2build.CONFIG += no_link
-QMAKE_EXTRA_COMPILERS += copy2build
+!equals(_PRO_FILE_PWD_, $$OUT_PWD) { #only do something in case of shadow build
+    # stolen from qtcreatorplugin.pri
+    copy2build.input = COPYFILES
+    copy2build.output = $$COPYDIR/${QMAKE_FUNC_FILE_IN_stripSrcDir}
+    isEmpty(vcproj):copy2build.variable_out = PRE_TARGETDEPS
+    copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
+    copy2build.name = COPY ${QMAKE_FILE_IN}
+    copy2build.CONFIG += no_link
+    QMAKE_EXTRA_COMPILERS += copy2build
+}
 
diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.pro b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.pro
index 976752c535..859bfe586e 100644
--- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.pro
+++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.pro
@@ -5,9 +5,9 @@ HEADERS += plugin1.h
 
 OTHER_FILES = $$PWD/plugin.xml
 
-include(../../../../../../../../qtcreator.pri)
-include(../../../../../extensionsystem.pri)
-include(../../../../../../../../tests/auto/qttestrpath.pri)
+include(../../../../../../qtcreator.pri)
+include(../../../../../../src/libs/extensionsystem/extensionsystem.pri)
+include(../../../../qttestrpath.pri)
 
 COPYDIR = $$OUT_PWD
 COPYFILES = $$OTHER_FILES
diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.pro b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.pro
index ff46c01cd3..01942c2ec2 100644
--- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.pro
+++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.pro
@@ -5,9 +5,9 @@ HEADERS += plugin2.h
 
 OTHER_FILES = $$PWD/plugin.xml
 
-include(../../../../../../../../qtcreator.pri)
-include(../../../../../extensionsystem.pri)
-include(../../../../../../../../tests/auto/qttestrpath.pri)
+include(../../../../../../qtcreator.pri)
+include(../../../../../../src/libs/extensionsystem/extensionsystem.pri)
+include(../../../../qttestrpath.pri)
 
 COPYDIR = $$OUT_PWD
 COPYFILES = $$OTHER_FILES
diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.pro b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.pro
index 5f3e5b4551..d3534184e8 100644
--- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.pro
+++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.pro
@@ -5,9 +5,9 @@ HEADERS += plugin3.h
 
 OTHER_FILES = $$PWD/plugin.xml
 
-include(../../../../../../../../qtcreator.pri)
-include(../../../../../extensionsystem.pri)
-include(../../../../../../../../tests/auto/qttestrpath.pri)
+include(../../../../../../qtcreator.pri)
+include(../../../../../../src/libs/extensionsystem/extensionsystem.pri)
+include(../../../../qttestrpath.pri)
 
 COPYDIR = $$OUT_PWD
 COPYFILES = $$OTHER_FILES
diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.pro b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.pro
index c68c5ba285..cc61cfd690 100644
--- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.pro
+++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.pro
@@ -5,9 +5,9 @@ HEADERS += plugin1.h
 
 OTHER_FILES = $$PWD/plugin.spec
 
-include(../../../../../../../../qtcreator.pri)
-include(../../../../../extensionsystem.pri)
-include(../../../../../../../../tests/auto/qttestrpath.pri)
+include(../../../../../../qtcreator.pri)
+include(../../../../../../src/libs/extensionsystem/extensionsystem.pri)
+include(../../../../qttestrpath.pri)
 
 COPYDIR = $$OUT_PWD
 COPYFILES = $$OTHER_FILES
diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.pro b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.pro
index c7caaf5fa2..a56a05066a 100644
--- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.pro
+++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.pro
@@ -5,9 +5,9 @@ HEADERS += plugin2.h
 
 OTHER_FILES = $$PWD/plugin.spec
 
-include(../../../../../../../../qtcreator.pri)
-include(../../../../../extensionsystem.pri)
-include(../../../../../../../../tests/auto/qttestrpath.pri)
+include(../../../../../../qtcreator.pri)
+include(../../../../../../src/libs/extensionsystem/extensionsystem.pri)
+include(../../../../qttestrpath.pri)
 
 COPYDIR = $$OUT_PWD
 COPYFILES = $$OTHER_FILES
diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.pro b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.pro
index e142575ec9..43c1149573 100644
--- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.pro
+++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.pro
@@ -5,9 +5,9 @@ HEADERS += plugin3.h
 
 OTHER_FILES = $$PWD/plugin.spec
 
-include(../../../../../../../../qtcreator.pri)
-include(../../../../../extensionsystem.pri)
-include(../../../../../../../../tests/auto/qttestrpath.pri)
+include(../../../../../../qtcreator.pri)
+include(../../../../../../src/libs/extensionsystem/extensionsystem.pri)
+include(../../../../qttestrpath.pri)
 
 COPYDIR = $$OUT_PWD
 COPYFILES = $$OTHER_FILES
diff --git a/tests/auto/extensionsystem/pluginmanager/test.pro b/tests/auto/extensionsystem/pluginmanager/test.pro
index bcdc8c2d9d..f9047d1927 100644
--- a/tests/auto/extensionsystem/pluginmanager/test.pro
+++ b/tests/auto/extensionsystem/pluginmanager/test.pro
@@ -6,8 +6,8 @@ TARGET = pluginmanager
 
 # Input
 
-include(../../../../../../tests/auto/qttest.pri)
-include(../../../extensionsystem.pri)
+include(../../qttest.pri)
+include(../../../../src/libs/extensionsystem/extensionsystem.pri)
 
 SOURCES += tst_pluginmanager.cpp
 
diff --git a/tests/auto/extensionsystem/pluginmanager/test.sh b/tests/auto/extensionsystem/pluginmanager/test.sh
deleted file mode 100755
index 426901ea74..0000000000
--- a/tests/auto/extensionsystem/pluginmanager/test.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-# -- run the plugin test from this directory.
-
-export LD_LIBRARY_PATH=../../../../../../lib:$LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH=../../../../../../bin/QtCreator.app/Contents/PlugIns:$DYLD_LIBRARY_PATH # mac
-exec ./test
diff --git a/tests/auto/extensionsystem/pluginspec/test.pro b/tests/auto/extensionsystem/pluginspec/test.pro
index 3f0f273081..2f86233cce 100644
--- a/tests/auto/extensionsystem/pluginspec/test.pro
+++ b/tests/auto/extensionsystem/pluginspec/test.pro
@@ -20,8 +20,8 @@ OTHER_FILES += \
     $$PWD/testdependencies/spec5.xml \
     $$PWD/testdir/spec.xml
 
-include(../../../../../../tests/auto/qttest.pri)
-include(../../../extensionsystem.pri)
+include(../../qttest.pri)
+include(../../../../src/libs/extensionsystem/extensionsystem.pri)
 
 COPYDIR = $$OUT_PWD
 COPYFILES = $$OTHER_FILES
diff --git a/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.pro b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.pro
index 6e81d29b13..4b3198fee0 100644
--- a/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.pro
+++ b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.pro
@@ -1,17 +1,16 @@
-include(../../../../../../../qtcreator.pri)
-
 TEMPLATE = lib
-TARGET = $$qtLibraryName(test)
 DEFINES += MYPLUGIN_LIBRARY
 SOURCES += testplugin.cpp
 HEADERS += testplugin.h testplugin_global.h
 
 OTHER_FILES += testplugin.xml
 
-include(../../../../extensionsystem.pri)
-
-include(../../../../../../../tests/auto/qttestrpath.pri)
+include(../../../../../qtcreator.pri)
+include(../../../../../src/libs/extensionsystem/extensionsystem.pri)
+include(../../../qttestrpath.pri)
 
 COPYDIR = $$OUT_PWD
 COPYFILES = $$PWD/testplugin.xml
 include(../../copy.pri)
+
+TARGET = $$qtLibraryName(test)