From ddc4f0b63ae13eee632663d7cb57c2b6d8207eb8 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sun, 10 Jan 2021 13:07:43 -0800 Subject: [PATCH] tox.ini (local): Handle environment variables SKIP_BOOTSTRAP, SKIP_CONFIGURE --- tox.ini | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 8b0da80c11f..1a666be9b2a 100644 --- a/tox.ini +++ b/tox.ini @@ -110,8 +110,10 @@ passenv = # If set, we use this prefix and push to it docker: DOCKER_PUSH_REPOSITORY local: MAKE - # Set to 1 to skip the system package install phase + # Set to 1 to skip preliminary install phases before make is invoked local: SKIP_SYSTEM_PKG_INSTALL + local: SKIP_BOOTSTRAP + local: SKIP_CONFIGURE local-direct: * setenv = @@ -467,8 +469,8 @@ commands = # #28728: gap fails its test suite. # linbox/cysignals testsuites fail. ppl takes very long. local: bash -c 'export PATH={env:PATH} && {env:SETENV} && \ - local: {env:BOOTSTRAP} && \ - local: ./configure --prefix={envdir}/local {env:CONFIGURE_ARGS} && \ + local: case "{env:SKIP_BOOTSTRAP:}" in 1|y*|Y*);; *) {env:BOOTSTRAP} ;; esac && \ + local: case "{env:SKIP_CONFIGURE:}" in 1|y*|Y*);; *) ./configure --prefix={envdir}/local {env:CONFIGURE_ARGS} ;; esac && \ local: case "{posargs:}" in \ local: bash) bash -i; exit ;; \ local: config*) ;; \