On Mon, 11 Mar 2024 at 19:54:00 +0100, Mattia Rizzolo wrote:
> +ifeq ($(DEB_HOST_ARCH_BITS)$(filter i386,$(DEB_HOST_ARCH_CPU)),32)
> execute_before_dh_auto_test:
> env PYTHONPATH='$(CURDIR)/debian/tests/python' \
> python3 -B -u -m struntime \
> --certdir='$(CURDIR)/debian/tests/certs' \
> --program='$(CURDIR)/src/stunnel'
> +endif
>
> +ifeq ($(DEB_HOST_ARCH_BITS)$(filter i386,$(DEB_HOST_ARCH_CPU)),32)
> override_dh_auto_test:
> dh_auto_test || { \
> printf '\n\n=== Some tests failed; here are all the
> logs...\n\n' 1>&2; \
> find tests/logs/ -type f -name '*.log' -exec grep -EHe '^' --
> '{}' + 1>&2; \
> false; \
> }
> +endif
Thanks for proposing this, but I think these should be ifneq instead
of ifeq: the current implementation looks like it's running tests on
exactly those architectures where you don't want to run tests :-)
The expression before the comma will expand to:
- 64: on amd64, arm64, s390x, etc. (we still want to run tests)
- 32: on armel, armhf, hppa, etc. (we don't want to run tests)
- 32i386: on i386 (we still want to run tests, because as a special
exception, i386 does not get 64-bit time_t)
so we want to run the tests if it expands to anything other than 32.
The two if(n)eq..endif blocks could also be combined into one, to make
it more obvious that their condition is the same.
smcv
