path: root/coin_build_instructions.py
diff options
authorAlexandru Croitor <alexandru.croitor@qt.io>2018-10-10 14:01:28 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2018-10-12 14:45:37 +0000
commit954fe04e4d4cb3f00d2891dc1a0843e91b115e7f (patch)
tree382892d7ac67546ea9d0cfc331589b4472af8504 /coin_build_instructions.py
parent43fe3494a9d902034896e3afa7b5158c77163be0 (diff)
Add tests to install built wheels and build some examples
Augment coin_test_instructions.py to run a new script testing/wheel_tester.py, which tries to pip install the built wheels, and then tries to build the samplebinding and scriptableapplication examples. This allows us to confirm that the generated wheels are actually installable, and also hopefully prevent us from breaking the embeddable examples, by making sure that they at least build (and execute in the case of samplebinding). The change also modifies the examples to be able to take the python executable as build argument, so that wheel_tester can specify explicitly which python interpeter to use. Change-Id: I0f141e40ab86e3311dd25915c4e53b0af36aaae9 Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'coin_build_instructions.py')
1 files changed, 3 insertions, 7 deletions
diff --git a/coin_build_instructions.py b/coin_build_instructions.py
index 6ef17246a..1104e996c 100644
--- a/coin_build_instructions.py
+++ b/coin_build_instructions.py
@@ -45,6 +45,7 @@ from build_scripts.utils import run_instruction
from build_scripts.utils import rmtree
from build_scripts.utils import get_python_dict
from build_scripts.utils import acceptCITestConfiguration
+from build_scripts.utils import get_ci_qmake_path
import os
# Values must match COIN thrift
@@ -108,13 +109,8 @@ def call_setup(python_ver):
cmd += ["bdist_wheel", "--standalone"]
cmd += ["build"]
- if CI_HOST_OS == "MacOS":
- cmd += ["--qmake=" + CI_ENV_INSTALL_DIR + "/bin/qmake"]
- elif CI_HOST_OS == "Windows":
- cmd += ["--qmake=" + CI_ENV_INSTALL_DIR + "\\bin\\qmake.exe"]
- else:
- cmd += ["--qmake=" + CI_ENV_INSTALL_DIR + "/bin/qmake"]
+ qmake_path = get_ci_qmake_path(CI_ENV_INSTALL_DIR, CI_HOST_OS)
+ cmd.append(qmake_path)
cmd += ["--build-tests",