diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2016-01-01 14:09:37 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2016-01-08 06:14:36 +0100 |
| commit | 5844fcae98ccc4d28aa1709fe1783b4232dac6ff (patch) | |
| tree | dd8453b49546ca8ba6bdba0f26c41ac5b2f6b152 /eclass/tests | |
| parent | scons-utils.eclass: Deprecate use_scons, ban it in EAPI 6 (diff) | |
| download | gentoo-5844fcae98ccc4d28aa1709fe1783b4232dac6ff.tar.gz gentoo-5844fcae98ccc4d28aa1709fe1783b4232dac6ff.tar.bz2 gentoo-5844fcae98ccc4d28aa1709fe1783b4232dac6ff.zip | |
scons-utils.eclass: tests, be more verbose on tests being performed
Diffstat (limited to 'eclass/tests')
| -rwxr-xr-x | eclass/tests/scons-utils.sh | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/eclass/tests/scons-utils.sh b/eclass/tests/scons-utils.sh index 5a65fbe63ffc..73871353c84a 100755 --- a/eclass/tests/scons-utils.sh +++ b/eclass/tests/scons-utils.sh @@ -8,7 +8,9 @@ source tests-common.sh inherit scons-utils test-scons_clean_makeopts() { - local sconsopts=$(scons_clean_makeopts ${1}) + tbegin "scons_clean_makeopts() for ${1}" + + local sconsopts=$(scons_clean_makeopts ${1}) ret=0 if [[ ${sconsopts} != ${2-${1}} ]]; then eerror "Self-test failed:" @@ -17,11 +19,11 @@ test-scons_clean_makeopts() { eerror "Expected: ${2-${1}}" eerror "Actual: ${sconsopts}" eoutdent - (( ++failed )) - return 1 + ret=1 fi - return 0 + tend ${ret} + return ${ret} } # jobcount expected for non-specified state @@ -29,8 +31,6 @@ jc=5 # failed test counter failed=0 -tbegin "scons_clean_makeopts()" - # sane MAKEOPTS test-scons_clean_makeopts '--jobs=14 -k' test-scons_clean_makeopts '--jobs=14 -k' @@ -59,6 +59,4 @@ test-scons_clean_makeopts '--jobs funnystuff -k' "--jobs=${jc} -k" test-scons_clean_makeopts '--jobs -l3' "--jobs=${jc}" test-scons_clean_makeopts '-j -l3' "-j ${jc}" -tend ${failed} - texit |