On Wed, Nov 13, 2024 at 12:43:40PM +0300, Dmitry Frolov wrote: > Some tests need more time when qemu is built with > "--enable-asan --enable-ubsan" > > As was discussed here: > https://patchew.org/QEMU/20241112120100.176492-2-frolov@swemel.r/u > > TIMEOUT_MULTIPLIER enviroment variable will be > a useful option, allowing non-invasive timeouts > increasing for a specific build. > > Signed-off-by: Dmitry Frolov <fro...@swemel.ru> > --- > scripts/mtest2make.py | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py > index eb01a05ddb..ff60b62724 100644 > --- a/scripts/mtest2make.py > +++ b/scripts/mtest2make.py > @@ -27,7 +27,9 @@ def names(self, base): > .speed.slow = $(foreach s,$(sort $(filter-out %-thorough, $1)), --suite $s) > .speed.thorough = $(foreach s,$(sort $1), --suite $s) > > +ifndef TIMEOUT_MULTIPLIER > TIMEOUT_MULTIPLIER = 1 > +endif
Can you explain what scenario this is needed for, as unless I'm missing something this change has no purpose. This assignment is merely defining the defalt value, which can already be overridden at runtime without this 'ifndef' eg $ make check-unit TIMEOUT_MULTIPLIER=7 In another shell: $ ps -axuwwf | grep 'meson test' berrange 1931657 3.9 0.1 330904 99344 pts/1 S+ 18:29 0:00 \_ /var/home/berrange/src/virt/qemu/build/pyvenv/bin/python3 /var/home/berrange/src/virt/qemu/build/pyvenv/bin/meson test --no-rebuild -t 7 --num-processes 1 --print-errorlogs --suite unit shows TIMEOUT_MULTIPLIER being honoured With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|