From 4c3ed6ec49413f86b3511daed5faedd895c59d43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 25 Nov 2022 14:20:23 +0100 Subject: [PATCH] Try installing the devel package when INSTALL_OR_SKIP is set --- smoke/venv.sh | 5 +++-- tests.yml | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/smoke/venv.sh b/smoke/venv.sh index e7bfea2..362aa33 100755 --- a/smoke/venv.sh +++ b/smoke/venv.sh @@ -15,8 +15,9 @@ INSTALL_OR_SKIP=${INSTALL_OR_SKIP:-false} workdir="$(mktemp --directory)" cd "$workdir" -if [ "$INSTALL_OR_SKIP" == "true" ] && [ ! -f "/usr/bin/$PYTHON" ]; then - dnf -y install "/usr/bin/$PYTHON" || : +if [ "$INSTALL_OR_SKIP" == "true" ]; then + [ ! -f "/usr/bin/$PYTHON" ] && dnf -y install "/usr/bin/$PYTHON" || : + dnf -y install "$PYTHON-devel" || : if [ ! -f "/usr/bin/$PYTHON" ]; then echo "/usr/bin/$PYTHON not installable, skipping this test" exit 0 diff --git a/tests.yml b/tests.yml index da26cbd..b5c0783 100644 --- a/tests.yml +++ b/tests.yml @@ -48,6 +48,9 @@ - smoke34_optional: dir: smoke run: runuser testuser -c 'VERSION=3.4 METHOD=venv INSTALL_OR_SKIP=true ./venv.sh' + - smoke310_optional: + dir: smoke + run: runuser testuser -c 'VERSION=3.10 METHOD=venv TOX=false INSTALL_OR_SKIP=true ./venv.sh' - smokepypy: dir: smoke run: runuser testuser -c 'VERSION=2.7 METHOD=virtualenv PYTHON=pypy ./venv.sh'