Browse Source

try to treat mingw as linux

pull/2/head
Skycoder42 7 years ago
parent
commit
11a225164d
No known key found for this signature in database GPG Key ID: 8E01AD9EF0578D2B
  1. 13
      tests/auto/testrun.pri

13
tests/auto/testrun.pri

@ -1,10 +1,10 @@
win32 {
!ReleaseBuild:!DebugBuild {
win32:!ReleaseBuild:!DebugBuild {
runtarget.target = run-tests
runtarget.CONFIG = recursive
runtarget.recurse_target = run-tests
QMAKE_EXTRA_TARGETS += runtarget
} else {
win32:!win32-g++ {
oneshell.target = .ONESHELL
CONFIG(debug, debug|release): outdir_helper = debug
@ -19,16 +19,14 @@ win32 {
runtarget.commands += $$escape_expand(\\n\\t)type $${outdir_helper}\\test.log
runtarget.commands += $$escape_expand(\\n\\t)@if exist $${outdir_helper}\\fail exit 42
QMAKE_EXTRA_TARGETS += oneshell runtarget
}
} else {
linux {
linux|win32-g++ {
runtarget_env_lib.target = run-tests
runtarget_env_lib.depends = export LD_LIBRARY_PATH := $$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$(LD_LIBRARY_PATH)
runtarget_env_qpa.target = run-tests
runtarget_env_qpa.depends += export QT_QPA_PLATFORM := minimal
QMAKE_EXTRA_TARGETS += \
runtarget_env_lib \
runtarget_env_qpa
QMAKE_EXTRA_TARGETS += runtarget_env_lib
!win32-g++: QMAKE_EXTRA_TARGETS += runtarget_env_qpa
} else:mac {
runtarget_env_lib.target = run-tests
runtarget_env_lib.depends = export DYLD_LIBRARY_PATH := $$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$(DYLD_LIBRARY_PATH)
@ -55,3 +53,4 @@ win32 {
runtarget.commands = ./$(TARGET)
QMAKE_EXTRA_TARGETS += runtarget
}
}

Loading…
Cancel
Save