Hi again,

2018-08-17 16:24 Manuel A. Fernandez Montecelo:
[...]
To try to address it, I first tried to increase the timeout only for the riscv64
architecture, with this recipe in debian/rules (the lines added and commented
out):

 ====================================================
 +++ systemd-239/debian/rules    2018-08-16 17:02:43.000000000 +0200
 @@ -5,6 +5,12 @@

  export LC_ALL = C.UTF-8

 +#include /usr/share/dpkg/architecture.mk
 +#
 +#ifeq ($(DEB_HOST_ARCH),riscv64)
 +#    TEST_TIMEOUT_MULTIPLIER = "-t 10"
 +#endif
 +
  include /usr/share/dpkg/default.mk

  ifeq ($(DEB_VENDOR),Ubuntu)
 @@ -282,6 +288,8 @@
  ifeq (, $(filter nocheck, $(DEB_BUILD_OPTIONS)))
         echo "01234567890123456789012345678901" > build-deb/machine-id
         # some tests hang under fakeroot, so disable fakeroot
 +#      env -u LD_PRELOAD 
SYSTEMD_MACHINE_ID_PATH=$(CURDIR)/build-deb/machine-id ninja 
$(TEST_TIMEOUT_MULTIPLIER) -C build-deb test || ( \
 +#
         env -u LD_PRELOAD 
SYSTEMD_MACHINE_ID_PATH=$(CURDIR)/build-deb/machine-id ninja -C build-deb test 
|| ( \
                 cat build-deb/meson-logs/testlog.txt; \
                 exit 1)
 ====================================================

However, I believe that this would have worked if invoking "meson test"
directly, but not when invoking "ninja", because it doesn't pass the -t argument
down to "meson test", and there doesn't seem to be any other way to achieve
this.

There's an open issue about this upstream, but it doesn't seem like it's to be
implemented any time soon:

 https://github.com/mesonbuild/meson/issues/2037

 (An environment variable would be a possible solution, I left a comment
 there).

In that bug report, a devel said:

 "ninja test just calls meson test, so they should definitely switch to
 meson test if they can."

And they are not happy with using env variables to change the default
timeouts.

So perhaps debian/rules should be changed to use "meson test" instead,
as Meson upstream recommended, and so we can pass on the "-t 10" for
riscv64.

However, as I said, I don't have experience with meson/ninja, so I am
unaware of possible problems or drawbacks.


Cheers.
--
Manuel A. Fernandez Montecelo <manuel.montez...@gmail.com>

Reply via email to