diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2018-12-18 08:47:19 +0200 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2019-01-09 05:43:14 +0000 |
| commit | 2b7c9e3a78e2c022f3484dff1bd69a4df7ddd149 (patch) | |
| tree | 34bc03f9b658efaf623e79e843b8a30571e05d9c | |
| parent | e3f2b8753d0e4e2c3e2b364ab16d07ac22a40a3b (diff) | |
Enable squish tests for IFW in Windows
Change-Id: I0219cc5acee4187516010bd766922259dd5d6220
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
| -rw-r--r-- | packaging-tools/bld_ifw_tools.py | 2 | ||||
| -rw-r--r-- | packaging-tools/build_wrapper.py | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/packaging-tools/bld_ifw_tools.py b/packaging-tools/bld_ifw_tools.py index e520e073c..92be5369c 100644 --- a/packaging-tools/bld_ifw_tools.py +++ b/packaging-tools/bld_ifw_tools.py @@ -307,7 +307,7 @@ def build_ifw(options, create_installer=False, build_ifw_examples=False): build_squish(options) # build installer framework build_installer_framework(options) - if build_ifw_examples: + if build_ifw_examples or options.squish_dir: build_installer_framework_examples(options) # steps when creating ifw installer if create_installer: diff --git a/packaging-tools/build_wrapper.py b/packaging-tools/build_wrapper.py index fd386c086..55b1bf80a 100644 --- a/packaging-tools/build_wrapper.py +++ b/packaging-tools/build_wrapper.py @@ -208,6 +208,11 @@ def handle_ifw_build(optionDict): temp = bldinstallercommon.locate_file(optionDict['WORK_DIR'], product_key_checker_pri) product_key_checker_pri = temp if temp else product_key_checker_pri + if optionDict['ENABLE_TESTS'] == "true" and bldinstallercommon.is_win_platform(): + squish_dir = 'C:\\Utils\\Squish_IFW' + else: + squish_dir = '' + # options object for ifw build ifw_bld_options = IfwOptions(qt_src_pkg, qt_configure_options, @@ -219,7 +224,8 @@ def handle_ifw_build(optionDict): qt_dynamic_bin_pkg, optionDict['SIGNING_SERVER'], optionDict['SIGNING_PASSWORD'], - False) # incremental + False, + squish_dir) # incremental # build ifw tools bld_ifw_installer = True if 'CREATE_IFW_INSTALLER' in optionDict else False bld_ifw_tools.build_ifw(ifw_bld_options, bld_ifw_installer) |