diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2021-12-17 11:27:20 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2021-12-21 08:08:20 +0100 |
| commit | fb8754b80b23c9f57169bbd6994e460b982c02ab (patch) | |
| tree | ab1434de91990d5994b843f206fbbf1f1b8d9719 | |
| parent | 44406d90e657afeea66e43b22eb4d4c897639276 (diff) | |
Run `make check` in flatpak build
Back when solenv/flatpak-manifest.in started with
68fda058972a6fbb38b797f50575b84f4cb3fab1 "Put flatpak-builder manifest file into
core repo", the default `make` target ran various unit- and slowchecks (so that
was what Flatpak builds did back then), until
a58e086ededb8442938e81f971dfae36ef7eb076 "rework the default make target"
changed the default `make` target to not run any checks at all (so that is what
Flatpak builds did since then).
Also, for one, 9cf2616c5e709b595eeee6ab88dacdfad2003f98 "Work around i386 kernel
vs. JVM bug for now by disabling all tests on i386" had made i386 not
run any tests at all (back when the default `make` target still ran various
unit- and slowchecks; and which was later cleaned up with
243c05ac27e3ffd94343630e668a53cf3ad18744 "Retire build-nocheck" when there was
no longer a need to explicitly mention build-nocheck to not run any checks at
all). But at least on Flathub we no longer do i386 builds anyway, so this is
presumably moot today.
And for another, 6cb20e0b298f41fe88984aebfe5454f936a0ae3a "Disable
CppunitTset_sc_*_functions_test for linux_aarch64 for now, too" had disabled
certain "tests for aarch64 for now too, to get Flathub builds unstuck" (back
when the default `make` target still ran various unit- and slowchecks). But
that has since been fixed (and 6cb20e0b298f41fe88984aebfe5454f936a0ae3a been
reverted with ae6f41424608b349b45eb3f18ee8c7cff5d6c182 "Revert 'Disable
CppunitTset_sc_*_functions_test for linux_aarch64 for now, too'"), with commits
culminating in 57ad86fec9e5b4981332392bdb5c5a1f5e468bfe "Allow for some variance
in results of some more Calc function calls".
A recent master test build with `make check` on Flathub succeeded at
<https://flathub.org/builds/#/builders/32/builds/71637> (for the two
architectures aarch64 and x86_64 that we build on Flathub), so lets enable that
for now and see how that works out in practice. If it proves too brittle with
too many spurious check failures, we can either restrict it to running fewer
checks (e.g., the old unit- and slowcheck behavior), or disable it completely
again.
Change-Id: I62efc41669ff634551fc07f24069f296f3d0d0bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127201
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | solenv/flatpak-manifest.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index 43dcbf331746..9fd2ef1964e6 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -687,7 +687,7 @@ "buildsystem": "simple", "build-commands": [ "./autogen.sh --prefix=/run/build/libreoffice/inst --with-distro=LibreOfficeFlatpak", - "make", + "make check", "make distro-pack-install", "make cmd cmd='$(SRCDIR)/solenv/bin/assemble-flatpak.sh'", "printf '<?xml version=\"1.0\"?>\\n<oor:data xmlns:xs=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:oor=\"http://openoffice.org/2001/registry\"><dependency file=\"main\"/><oor:component-data oor:name=\"Common\" oor:package=\"org.openoffice.Office\"><node oor:name=\"Misc\"><prop oor:name=\"UseOpenCL\"><value>false</value></prop></node></oor:component-data></oor:data>' >/app/libreoffice/share/registry/flatpak.xcd" |