hatam
/
QtMvvm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

try fix win testrun

pull/2/head
Skycoder42 7 years ago
parent
c6c5b8fd7f
commit
3a21251f0f
No known key found for this signature in database GPG Key ID: 8E01AD9EF0578D2B
1 changed files with 38 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 63
      tests/auto/testrun.pri

63
tests/auto/testrun.pri
View File

@ -1,62 +1,53 @@
win32 {
!ReleaseBuild:!DebugBuild {
runtarget.target = run-tests
runtarget.CONFIG = recursive
runtarget.recurse_target = run-tests
QMAKE_EXTRA_TARGETS += runtarget
} else {
runtarget.target = run-tests
runtarget.depends += $(DESTDIR_TARGET)
runtarget.commands += @set "PATH=$$shell_path($$shadowed($$dirname(_QMAKE_CONF_))/bin);$$shell_path($$[QT_INSTALL_BINS]);$(PATH)"
runtarget.commands += $$escape_expand(\\n\\t)@set "QT_PLUGIN_PATH=$$shadowed($$dirname(_QMAKE_CONF_))/plugins;$(QT_PLUGIN_PATH)"
runtarget.commands += $$escape_expand(\\n\\t)@set "QML2_IMPORT_PATH=$$shadowed($$dirname(_QMAKE_CONF_))/qml;$(QML2_IMPORT_PATH)"
runtarget.commands += $$escape_expand(\\n\\t)@set QT_QPA_PLATFORM=minimal
runtarget.commands += $$escape_expand(\\n\\t)start /w call $(DESTDIR_TARGET) ^> $(DESTDIR)test.log ^|^| echo FAIL ^> fail ^& exit 0
runtarget.commands += $$escape_expand(\\n\\t)type $(DESTDIR)test.log
runtarget.commands += $$escape_expand(\\n\\t)@if exist fail exit 1
QMAKE_EXTRA_TARGETS += runtarget
}
} else {
linux { linux {
runtarget_env_bin.target = run-tests
runtarget_env_bin.depends = export PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/bin/:$$[QT_INSTALL_BINS]:$(PATH)"
runtarget_env_lib.target = run-tests 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_lib.depends = export LD_LIBRARY_PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$(LD_LIBRARY_PATH)"
runtarget_env_plugins.target = run-tests
runtarget_env_plugins.depends = export QT_PLUGIN_PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/plugins/:$(QT_PLUGIN_PATH)"
runtarget_env_qml.target = run-tests
runtarget_env_qml.depends += export QML2_IMPORT_PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/qml/:$(QML2_IMPORT_PATH)"
runtarget_env_qpa.target = run-tests runtarget_env_qpa.target = run-tests
runtarget_env_qpa.depends += export QT_QPA_PLATFORM := "minimal" runtarget_env_qpa.depends += export QT_QPA_PLATFORM := "minimal"
QMAKE_EXTRA_TARGETS += \ QMAKE_EXTRA_TARGETS += \
runtarget_env_bin \
runtarget_env_lib \ runtarget_env_lib \
runtarget_env_plugins \
runtarget_env_qml\
runtarget_env_qpa runtarget_env_qpa
} else:mac { } else:mac {
runtarget_env_bin.target = run-tests
runtarget_env_bin.depends = export PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/bin/:$$[QT_INSTALL_BINS]:$(PATH)"
runtarget_env_lib.target = run-tests 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)" runtarget_env_lib.depends = export DYLD_LIBRARY_PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$(DYLD_LIBRARY_PATH)"
runtarget_env_framework.target = run-tests runtarget_env_framework.target = run-tests
runtarget_env_framework.depends = export DYLD_FRAMEWORK_PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$(DYLD_FRAMEWORK_PATH)" runtarget_env_framework.depends = export DYLD_FRAMEWORK_PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$(DYLD_FRAMEWORK_PATH)"
runtarget_env_plugins.target = run-tests
runtarget_env_plugins.depends = export QT_PLUGIN_PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/plugins/:$(QT_PLUGIN_PATH)"
runtarget_env_qml.target = run-tests
runtarget_env_qml.depends += export QML2_IMPORT_PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/qml/:$(QML2_IMPORT_PATH)"
QMAKE_EXTRA_TARGETS += \ QMAKE_EXTRA_TARGETS += \
runtarget_env_bin \
runtarget_env_lib \ runtarget_env_lib \
runtarget_env_framework \ runtarget_env_framework
runtarget_env_plugins \ }
runtarget_env_qml
} else:win32 {
runtarget_env_bin.target = run-tests runtarget_env_bin.target = run-tests
runtarget_env_bin.depends = export PATH := "$$shadowed($$dirname(_QMAKE_CONF_))\bin\;$$shell_path($$[QT_INSTALL_BINS]);$(PATH)" runtarget_env_bin.depends = export PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/bin/:$$[QT_INSTALL_BINS]:$(PATH)"
runtarget_env_plugins.target = run-tests runtarget_env_plugins.target = run-tests
runtarget_env_plugins.depends = export QT_PLUGIN_PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/plugins/;$(QT_PLUGIN_PATH)" runtarget_env_plugins.depends = export QT_PLUGIN_PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/plugins/:$(QT_PLUGIN_PATH)"
runtarget_env_qml.target = run-tests runtarget_env_qml.target = run-tests
runtarget_env_qml.depends += export QML2_IMPORT_PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/qml/;$(QML2_IMPORT_PATH)" runtarget_env_qml.depends += export QML2_IMPORT_PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/qml/:$(QML2_IMPORT_PATH)"
runtarget_env_qpa.target = run-tests
runtarget_env_qpa.depends += export QT_QPA_PLATFORM := "minimal"
QMAKE_EXTRA_TARGETS += \ QMAKE_EXTRA_TARGETS += \
runtarget_env_bin \ runtarget_env_bin \
runtarget_env_plugins \ runtarget_env_plugins \
runtarget_env_qml\ runtarget_env_qml
runtarget_env_qpa
}
win32:!ReleaseBuild:!DebugBuild {
runtarget.target = run-tests
runtarget.CONFIG = recursive
runtarget.recurse_target = run-tests
QMAKE_EXTRA_TARGETS += runtarget
} else {
runtarget.target = run-tests runtarget.target = run-tests
runtarget.depends += $(TARGET) runtarget.depends += $(TARGET)
win32: runtarget.commands = .\$(TARGET) runtarget.commands = ./$(TARGET)
else: runtarget.commands = ./$(TARGET)
QMAKE_EXTRA_TARGETS += runtarget QMAKE_EXTRA_TARGETS += runtarget
} }

Write Preview
Loading…
Cancel
Save