setop/pyenv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix test "yaml is installed for python" in MacOS

Browse Source
This commit is contained in:
Ivan Pozdeev 2025-05-13 01:39:28 +03:00
parent f2c998c866
commit 458d2cc3b1
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/python-build/bin/python-build
View File

@ -141,8 +141,9 @@ can_use_homebrew() {
local brew_prefix local brew_prefix
command -v brew &>/dev/null && \ command -v brew &>/dev/null && \
# tests can have non-functional `brew' stub aliased to `false' # tests can have non-functional `brew' stub aliased to `false'
brew_prefix="$(brew --prefix)" && # in Bash 3.2, var="$(cmd)" errexits on failure even if part of a conditional chain
[[ $(abs_dirname "${BASH_SOURCE}") == "$(abs_dirname "${brew_prefix}")"/* ]] && brew_prefix="$(brew --prefix || true)" && [[ -n "$brew_prefix" ]] && \
[[ $(abs_dirname "${BASH_SOURCE}") == "$(abs_dirname "${brew_prefix}")"/* ]] && \
{ lock_in homebrew; return 0; } { lock_in homebrew; return 0; }
# do not check the same stuff multiple times # do not check the same stuff multiple times

6
plugins/python-build/test/build.bats
View File

@ -70,6 +70,9 @@ assert_build_log() {
install_fixture definitions/needs-yaml install_fixture definitions/needs-yaml
assert_success assert_success
unstub uname
unstub make
assert_build_log <<OUT assert_build_log <<OUT
yaml-0.1.6: CFLAGS="" CPPFLAGS="-I${TMP}/install/include" LDFLAGS="-L${TMP}/install/lib -Wl,-rpath,${TMP}/install/lib" PKG_CONFIG_PATH="" yaml-0.1.6: CFLAGS="" CPPFLAGS="-I${TMP}/install/include" LDFLAGS="-L${TMP}/install/lib -Wl,-rpath,${TMP}/install/lib" PKG_CONFIG_PATH=""
yaml-0.1.6: --prefix=$INSTALL_ROOT yaml-0.1.6: --prefix=$INSTALL_ROOT
@ -80,9 +83,6 @@ Python-3.6.2: --prefix=$INSTALL_ROOT --enable-shared --libdir=$INSTALL_ROOT/lib
make -j 2 make -j 2
make install make install
OUT OUT
unstub uname
unstub make
} }
@test "apply global and package-specific flags, package flags come later to have precedence" { @test "apply global and package-specific flags, package flags come later to have precedence" {