aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@qt.io>2019-11-11 10:30:56 +0200
committerKatja Marttila <katja.marttila@qt.io>2019-11-11 10:36:08 +0000
commit192d3a33d5ca68db4dab622998d0269484908f9f (patch)
tree5a065c9badfe021a3041befc14d735672b2c66b8
parente691c5d99a22ba6ef96e9d5047a6a3f724c30b45 (diff)
IFW: Fix ENABLE_TESTS checkv5.12.6-packaging
Change-Id: Ib45ad49385b9b03d22bda53ec483eb060cbbf52b Reviewed-by: Antti Kokko <antti.kokko@qt.io>
-rw-r--r--packaging-tools/build_wrapper.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/packaging-tools/build_wrapper.py b/packaging-tools/build_wrapper.py
index 8c3c7b170..877fe1ba2 100644
--- a/packaging-tools/build_wrapper.py
+++ b/packaging-tools/build_wrapper.py
@@ -209,10 +209,9 @@ 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 = ''
+ if 'ENABLE_TESTS' in optionDict and 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,