Fix QLibrary autotest for Windows

The libraries were built into wrong directory in Windows. Fixed it so
that the libraries are built into debug and release directories like
the test executable.

Also fixed QMAKE_CLEAN statement, which was using incorrect separator.

Task-number: QTBUG-24151
Change-Id: Iade656af5f83ef2b79c2b9c4177df4a16b2f6821
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Miikka Heikkinen 2012-02-28 12:58:02 +02:00 committed by Qt by Nokia
parent 87366cc7ab
commit b491d02eb3
3 changed files with 17 additions and 4 deletions

View File

@ -13,3 +13,11 @@ win32-borland: DEFINES += WIN32_BORLAND
# This project is testdata for tst_qlibrary
target.path = $$[QT_INSTALL_TESTS]/tst_qlibrary
INSTALLS += target
win32 {
CONFIG(debug, debug|release) {
DESTDIR = ../debug/
} else {
DESTDIR = ../release/
}
}

View File

@ -15,13 +15,20 @@ win32-borland: DEFINES += WIN32_BORLAND
# We want to test if we can load a shared library with *any* filename...
win32 {
CONFIG(debug, debug|release) {
BUILD_FOLDER = debug
} else {
BUILD_FOLDER = release
}
DESTDIR = ../$$BUILD_FOLDER/
# vcproj and Makefile generators refer to target differently
contains(TEMPLATE,vc.*) {
src = $(TargetPath)
} else {
src = $(DESTDIR_TARGET)
}
files = mylib.dl2 system.qt.test.mylib.dll
files = $$BUILD_FOLDER$${QMAKE_DIR_SEP}mylib.dl2 $$BUILD_FOLDER$${QMAKE_DIR_SEP}system.qt.test.mylib.dll
} else {
src = $(DESTDIR)$(TARGET)
files = libmylib.so2 system.qt.test.mylib.so
@ -34,7 +41,7 @@ renamed_target.path = $$target.path
for(file, files) {
QMAKE_POST_LINK += $$QMAKE_COPY $$src ..$$QMAKE_DIR_SEP$$file &&
renamed_target.extra += $$QMAKE_COPY $$src $(INSTALL_ROOT)$${target.path}$$QMAKE_DIR_SEP$$file &&
CLEAN_FILES += ../$$file
CLEAN_FILES += ..$$QMAKE_DIR_SEP$$file
}
renamed_target.extra = $$member(renamed_target.extra, 0, -2)
QMAKE_POST_LINK = $$member(QMAKE_POST_LINK, 0, -2)

View File

@ -13,5 +13,3 @@ win32 {
}
TESTDATA += ../library_path/invalid.so
win32:CONFIG += insignificant_test # QTBUG-24151