strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "oss-fuzz runs under docker"

Browse source 
This reverts commit 210f594773.

Just disable the check if running inside docker

http://stackoverflow.com/questions/23513045/how-to-check-if-a-process-is-running-inside-docker-container

Change-Id: Ib11a2ccb7f0b2bd5e174b9b3adaf8a28474f2908
Reviewed-on: https://gerrit.libreoffice.org/34544
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Michael Stahl 2017-02-22 15:01:12 +01:00 committed by Caolán McNamara
parent 3386519e7e
commit 21f8277c6d
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Makefile.in
View file

@ -9,7 +9,7 @@
gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck uicheck screenshot gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck uicheck screenshot
.PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch findunusedcode get-submodules id install install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS) .PHONY : all check-if-root bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch findunusedcode get-submodules id install install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
MAKECMDGOALS?=all MAKECMDGOALS?=all
build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\ build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\
@ -54,6 +54,14 @@ else # MAKE_RESTARTS
all: build all: build
check-if-root:
@if test `id -u` = 0 && ! grep -q 'lxc\|docker' /proc/self/cgroup; then \
echo; \
echo 'No. You make ME a sandwich.'; \
echo; \
exit 1; \
fi
gb_Side ?= host gb_Side ?= host
include $(BUILDDIR)/config_$(gb_Side).mk include $(BUILDDIR)/config_$(gb_Side).mk
@ -243,7 +251,7 @@ endif
# #
# Bootstrap # Bootstrap
# #
bootstrap: compilerplugins bootstrap: check-if-root compilerplugins
# #
# Build # Build