2
0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-22 01:51:51 +00:00

Makefile, travis: unify checking GCOV env var

Setting GCOV environment variable is used for doing profiling (gcov).
Unfortunately, it is checked in two different ways:

1. In top Makefile and scripts/travis, it is checked against "1".
2. In other places, it's checked to be set to a non-empty value.

So, giving various values to GCOV will lead to different results.

Let's unify the approaches used. Apparently, among all the code the
easiest (and not too strict) way is to check for non-empty value
(this also leads to the smallest possible patch size).

Note that in Python, evaluating an empty string in a binary context
(such as after an "if" statement) equals to False.

Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
This commit is contained in:
Kir Kolyshkin 2016-10-20 20:04:47 -07:00 committed by Pavel Emelyanov
parent d9bd1dbb8b
commit 5c0289845d
2 changed files with 2 additions and 2 deletions

View File

@ -110,7 +110,7 @@ WARNINGS := -Wall -Wformat-security
CFLAGS-GCOV := --coverage -fno-exceptions -fno-inline
export CFLAGS-GCOV
ifeq ($(GCOV),1)
ifneq ($(GCOV),)
LDFLAGS += -lgcov
CFLAGS += $(CFLAGS-GCOV)
endif

View File

@ -2,7 +2,7 @@
set -x -e
# We only need to run the below for gcov-enabled builds
[ "$GCOV" = "1" ] || exit 0
test -z "$GCOV" && exit 0
sudo apt-get install -qq -y lcov
gem install coveralls-lcov