Merge branch 't/30944/tox__improve_local_sudo_ubuntu_standard' into t…

…/31064/ci_cygwin__yml__adjust_to_new_script_packages__bootstrap___prereq
sagemath · Dec 16, 2020 · be4177b · be4177b
2 parents 752f657 + e9ca2c1
commit be4177b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/build/bin/sage-print-system-package-command b/build/bin/sage-print-system-package-command
@@ -49,6 +49,7 @@ if [ -z "$system" -o -z "$command" ]; then
 fi
 system_packages="$*"
 options=
+env=
 shopt -s extglob
 case $system:$command in
     homebrew*:setup-build-env)
@@ -73,8 +74,8 @@ case $system:$command in
         ;;
     @(debian*|ubuntu*):*)
         [ "$NO_INSTALL_RECOMMENDS" = yes ] && options="$options --no-install-recommends"
-        [ "$YES" = yes ] && options="$options --yes"
-        [ -n "$system_packages" ] && echo "${PROMPT}${SUDO}apt-get $command $options $system_packages"
+        [ "$YES" = yes ] && options="$options --yes" env="DEBIAN_FRONTEND=noninteractive "
+        [ -n "$system_packages" ] && echo "${PROMPT}${SUDO}${env}apt-get $command $options $system_packages"
         ;;
     @(fedora*|redhat*|centos*):install)
         [ "$YES" = yes ] && options="$options -y"

diff --git a/tox.ini b/tox.ini
@@ -350,6 +350,7 @@ setenv =
     local-nobootstrap: BOOTSTRAP=:
     local-!direct:    PATH=/usr/bin:/bin:/usr/sbin:/sbin
     local-sudo:       __SUDO=--sudo
+    local-root:       CONFIG_CONFIGURE_ARGS_ROOT=--enable-build-as-root
     # brew caches downloaded files in ${HOME}/Library/Caches. We share it between different toxenvs.
     local-homebrew:   HOMEBREW={envdir}/homebrew
     local-homebrew-usrlocal:  HOMEBREW=/usr/local
@@ -388,7 +389,7 @@ setenv =
     #
     # Resulting full configuration args, including EXTRA_CONFIGURE_ARGS from the user environment
     #
-                      CONFIGURE_ARGS={env:CONFIG_CONFIGURE_ARGS_1:} {env:CONFIG_CONFIGURE_ARGS_2:} {env:EXTRA_CONFIGURE_ARGS:}
+                      CONFIGURE_ARGS={env:CONFIG_CONFIGURE_ARGS_ROOT:} {env:CONFIG_CONFIGURE_ARGS_1:} {env:CONFIG_CONFIGURE_ARGS_2:} {env:EXTRA_CONFIGURE_ARGS:}
 
 # environment will be skipped if regular expression does not match against the sys.platform string
 platform =
@@ -426,10 +427,11 @@ commands =
     local-conda:   bash -c '{env:SETENV} && {env:CONDA_PREFIX}/bin/conda update -n base --yes conda'
     local-conda:   bash -c 'PACKAGES=$(build/bin/sage-get-system-packages conda $(PATH=build/bin:$PATH build/bin/sage-package list {env:SAGE_PACKAGE_LIST_ARGS}) _bootstrap); {env:SETENV} && {env:CONDA_PREFIX}/bin/conda install --yes --quiet $PACKAGES'
     #
+    # local-root:  Assume we are root, run the system package commands
     # local-sudo:  Use sudo to run the system package commands as root
     #
-    local-sudo:    bash -c '$(build/bin/sage-print-system-package-command {env:SYSTEM} update) #'
-    local-sudo:    bash -c 'PACKAGES=$(build/bin/sage-get-system-packages {env:SYSTEM} $(PATH=build/bin:$PATH build/bin/sage-package list {env:SAGE_PACKAGE_LIST_ARGS}) _bootstrap); $(build/bin/sage-print-system-package-command {env:SYSTEM} {env:__SUDO:} --yes --no-install-recommends install $PACKAGES) || [ "$IGNORE_MISSING_SYSTEM_PACKAGES" = yes ] && echo "(ignoring errors)" '
+    local-{root,sudo}:    bash -c 'eval $(build/bin/sage-print-system-package-command {env:SYSTEM} {env:__SUDO:} update) #'
+    local-{root,sudo}:    bash -c 'PACKAGES=$(build/bin/sage-get-system-packages {env:SYSTEM} $(PATH=build/bin:$PATH build/bin/sage-package list {env:SAGE_PACKAGE_LIST_ARGS}) _bootstrap); eval $(build/bin/sage-print-system-package-command {env:SYSTEM} {env:__SUDO:} --yes --no-install-recommends install $PACKAGES) || [ "$IGNORE_MISSING_SYSTEM_PACKAGES" = yes ] && echo "(ignoring errors)" '
     #
     # All "local" environments
     #
@@ -463,7 +465,15 @@ commands =
     docker:        done'
     # #28728: gap fails its test suite.
     # linbox/cysignals testsuites fail.  ppl takes very long.
-    local:         bash -c 'export PATH={env:PATH} && {env:SETENV} && {env:BOOTSTRAP} && ./configure --prefix={envdir}/local {env:CONFIGURE_ARGS} && make -k V=0 base-toolchain && make -k V=0 SAGE_SPKG="sage-spkg -y -o" SAGE_CHECK=warn SAGE_CHECK_PACKAGES="!cython,!r,!python3,!nose,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!symengine_py" {env:TARGETS_PRE:} {posargs:build} && (make -k V=0 SAGE_SPKG="sage-spkg -y -o" SAGE_CHECK=warn SAGE_CHECK_PACKAGES="!cython,!r,!python3,!nose,!gap,!cysignals,!linbox,!git,!ppl,!cmake" {env:TARGETS_OPTIONAL:} || echo "(error ignored)" ) '
+    local:         bash -c 'export PATH={env:PATH} && {env:SETENV} && \
+    local:             {env:BOOTSTRAP} && \
+    local:             ./configure --prefix={envdir}/local {env:CONFIGURE_ARGS} && \
+    local:             case "{posargs:}" in \
+    local:                 config*) ;; \
+    local:                 *)       make -k V=0 base-toolchain ;; \
+    local:             esac && \
+    local:             make -k V=0 SAGE_SPKG="sage-spkg -y -o" SAGE_CHECK=warn SAGE_CHECK_PACKAGES="!cython,!r,!python3,!nose,!gap,!cysignals,!linbox,!git,!ppl,!cmake,!networkx,!symengine_py" {env:TARGETS_PRE:} {posargs:build} && \
+    local:             ([ -z "{env:TARGETS_OPTIONAL:}" ] || make -k V=0 SAGE_SPKG="sage-spkg -y -o" SAGE_CHECK=warn SAGE_CHECK_PACKAGES="!cython,!r,!python3,!nose,!gap,!cysignals,!linbox,!git,!ppl,!cmake" {env:TARGETS_OPTIONAL:} || echo "(error ignored)" ) '
 
 [testenv:check_configure]
 ## Test that configure behaves properly