diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2022-10-28 11:59:52 +0200 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2022-11-15 17:34:06 +0100 |
| commit | 95a6dff78a57dde2133dba050d16cae2c5113b23 (patch) | |
| tree | 716b2c63015ca685576519dd58e6cd88eb3f69af /eclass/tests | |
| parent | scons-utils.eclass: Default SCONS_MIN_VERSION to current stable (diff) | |
| download | gentoo-95a6dff78a57dde2133dba050d16cae2c5113b23.tar.gz gentoo-95a6dff78a57dde2133dba050d16cae2c5113b23.tar.bz2 gentoo-95a6dff78a57dde2133dba050d16cae2c5113b23.zip | |
scons-utils.eclass: Reuse makeopts_jobs
Closes: https://github.com/gentoo/gentoo/pull/27999
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'eclass/tests')
| -rwxr-xr-x | eclass/tests/scons-utils.sh | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/eclass/tests/scons-utils.sh b/eclass/tests/scons-utils.sh deleted file mode 100755 index 5f1cd2036047..000000000000 --- a/eclass/tests/scons-utils.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -_PYTHON_R1=1 -source tests-common.sh || exit - -inherit scons-utils - -test-scons_clean_makeopts() { - tbegin "scons_clean_makeopts() for ${1}" - - local SCONSOPTS ret=0 - _scons_clean_makeopts ${1} - - if [[ ${SCONSOPTS} != ${2-${1}} ]]; then - eerror "Self-test failed:" - eindent - eerror "MAKEOPTS: ${1}" - eerror "Expected: ${2-${1}}" - eerror "Actual: ${SCONSOPTS}" - eoutdent - ret=1 - fi - - tend ${ret} - return ${ret} -} - -# jobcount expected for non-specified state -jc=$(( $(get_nproc) + 1 )) -# failed test counter -failed=0 - -# sane MAKEOPTS -test-scons_clean_makeopts '--jobs=14 -k' -test-scons_clean_makeopts '--jobs=14 -k' -test-scons_clean_makeopts '--jobs 15 -k' -test-scons_clean_makeopts '--jobs=16 --keep-going' -test-scons_clean_makeopts '-j17 --keep-going' -test-scons_clean_makeopts '-j 18 --keep-going' - -# needing cleaning -test-scons_clean_makeopts '--jobs -k' "--jobs=${jc} -k" -test-scons_clean_makeopts '--jobs --keep-going' "--jobs=${jc} --keep-going" -test-scons_clean_makeopts '-kj' "-kj ${jc}" - -# broken by definition (but passed as it breaks make as well) -test-scons_clean_makeopts '-jk' -test-scons_clean_makeopts '--jobs=randum' -test-scons_clean_makeopts '-kjrandum' - -# needing stripping -test-scons_clean_makeopts '--load-average=25 -kj16' '-kj16' -test-scons_clean_makeopts '--load-average 25 -k -j17' '-k -j17' -test-scons_clean_makeopts '-j2 HOME=/tmp' '-j2' -test-scons_clean_makeopts '--jobs funnystuff -k' "--jobs=${jc} -k" - -# bug #388961 -test-scons_clean_makeopts '--jobs -l3' "--jobs=${jc}" -test-scons_clean_makeopts '-j -l3' "-j ${jc}" - -texit |