diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-04-07 12:55:55 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-04-07 15:01:10 +0200 |
| commit | 7ecd3a095b33660f07f5361ead7e74530e7dadba (patch) | |
| tree | 4090e39db86769ef6b594859382ea3edc767777c /Makefile.in | |
| parent | tdf#141528 ensure that reset of linked state is executed (diff) | |
| download | core-7ecd3a095b33660f07f5361ead7e74530e7dadba.tar.gz core-7ecd3a095b33660f07f5361ead7e74530e7dadba.zip | |
skip check-if-root test if LIB_FUZZING_ENGINE is set
https://github.com/google/oss-fuzz/pull/5588/checks?check_run_id=2285987092
Where presubmit checks for oss-fuzz fail with
Makefile:62: recipe for target 'check-if-root' failed
despite the efforts made to detect running inside a container
LIB_FUZZING_ENGINE is set by oss-fuzz which builds LibreOffice by
calling bin/oss-fuzz-build.sh which uses
distro-configs/LibreOfficeOssFuzz.conf that enables --enable-fuzzers and
--enable-fuzzers ensures LIB_FUZZING_ENGINE is set, so checking for
LIB_FUZZING_ENGINE seems a reasonable test here to skip the root check
Change-Id: I930c87c13bd365b0adbefd3625598a89e48468ff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113731
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index ac3334d6f9c8..23b4d4f17d90 100644 --- a/Makefile.in +++ b/Makefile.in @@ -59,7 +59,7 @@ else # MAKE_RESTARTS .DEFAULT_GOAL := build check-if-root: - @if test ! `uname` = 'Haiku' -a `id -u` = 0 && test -z $$container && ! grep -q 'lxc\|docker' /proc/self/cgroup && ! grep -q 'libpod_parent' /proc/self/cgroup; then \ + @if test ! `uname` = 'Haiku' -a `id -u` = 0 && test -z $$LIB_FUZZING_ENGINE && test -z $$container && ! grep -q 'lxc\|docker' /proc/self/cgroup && ! grep -q 'libpod_parent' /proc/self/cgroup; then \ echo; \ echo 'Building LibreOffice as root is a very bad idea, use a regular user.'; \ echo; \ |