Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
fengzch-das
multibuild
Commits
44cf443d
Commit
44cf443d
authored
Mar 17, 2020
by
mattip
Browse files
set PYTHON_EXE for pre-install tests, remove another "brew update"
parent
31e1a5f1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
5 deletions
+7
-5
tests/test_multibuild.sh
tests/test_multibuild.sh
+7
-5
No files found.
tests/test_multibuild.sh
View file @
44cf443d
...
...
@@ -2,8 +2,14 @@
export
PS4
=
'+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
set
-x
source
common_utils.sh
source
tests/utils.sh
# This is normally set
# - on linux via docker_build_wrap.sh, docker_test_wrap.sh
# - on macOS via make_workon_env or install_macpython,
# which is called by get_macpython_environment which is called by before_install
# We call it here so that these pre-install tests succeed
PYTHON_EXE
=
python
source
tests/utils.sh
source
tests/test_common_utils.sh
source
tests/test_fill_submodule.sh
...
...
@@ -11,10 +17,6 @@ if [ -n "$IS_OSX" ]; then
source
osx_utils.sh
MB_PYTHON_OSX_VER
=
${
MB_PYTHON_OSX_VER
:-
$(
macpython_sdk_for_version
$MB_PYTHON_VERSION
)
}
# To work round:
# https://travis-ci.community/t/syntax-error-unexpected-keyword-rescue-expecting-keyword-end-in-homebrew/5623
brew update
get_macpython_environment
$MB_PYTHON_VERSION
${
VENV
:-
""
}
$MB_PYTHON_OSX_VER
source
tests/test_python_install.sh
source
tests/test_fill_pyver.sh
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment