#3 Use timeout multiplier for riscv64
Merged 4 months ago by kalev. Opened 4 months ago by rjones.
rpms/ rjones/snapshot riscv64-test-timeout  into  rawhide

Use timeout multiplier for riscv64
David Abdurachmanov • 4 months ago  
file modified
+5 -1
@@ -105,7 +105,11 @@ 

  

  %if %{with check}

  %check

- %meson_test

+ %meson_test \

+ %ifarch riscv64

+     --timeout-multiplier 10 \

+ %endif

+     %{nil}

  

  appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_metainfodir}/org.gnome.Snapshot.metainfo.xml

  desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Snapshot.desktop

[..]
Summary of Failures:
4/4 Cargo tests TIMEOUT 400.06s killed by signal 15 SIGTERM
Ok: 3
Expected Fail: 0
Fail: 0
Unexpected Pass: 0
Skipped: 0
Timeout: 1
[..]

Signed-off-by: David Abdurachmanov davidlt@rivosinc.com

Fine with me, but have you considered changing %meson_test on riscv64 to pass --timeout-multiplier 10 for all packages that use the macro? It would avoid having to potentially update tons of packages.

In any case, feel free to merge this and build, and thanks!

So far we have <300 modified packages in Fedora/RISCV dist-git overlay, and the smallest delta between downstream and upstream Fedora Kojis was ~1500 packages, where ~1000 just doesn't build in general (see mass rebuild results). Thus it's not that many packages that we modified timeouts (at least today), and hardware is getting faster.

Otherwise both approaches work for me. I will leave this up to @rjones and meson macro maintainers.

It definitely would be easier to switch it off at some point in one place globally.

I will examine what it would take to modify the macro & get back.

So turns out modifying the %meson_test macro where it is defined is very hard indeed. Adding just the extra parameter is possible, but making it conditional on %ifarch riscv64 seems impossible as far as I can tell. The rpm syntax used in macros files is somehow different from the regular syntax and I couldn't work out how.

The larger problem is that all of this stuff is upstream in the meson project (rather than in Fedora dist-git) requiring a patch there, which is... difficult.

Thanks for checking! Let's go with the patch here then.

rebased onto d117352

4 months ago

Pull-Request has been merged by kalev

4 months ago
Metadata