Commit 5c028984 authored by Kir Kolyshkin's avatar Kir Kolyshkin Committed by Pavel Emelyanov

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: 's avatarKir Kolyshkin <kir@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent d9bd1dbb
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment