fixes buildtype coverage and minsize release

pull/2/head
nosamad 4 years ago
parent 72228bee48
commit 7d32f5b575

@ -18,7 +18,7 @@ env:
- DISTRIB_ID=ubuntu VARIANT=coverage MARCH=x86_64 CHECK_TARGET=check
- DISTRIB_ID=ubuntu VARIANT=release MARCH=x86_64 CHECK_TARGET=memcheck
- DISTRIB_ID=ubuntu VARIANT=debug MARCH=arm32v7 CHECK_TARGET=check
- DISTRIB_ID=ubuntu VARIANT=min_size_rel MARCH=arm32v7 CHECK_TARGET=check
- DISTRIB_ID=ubuntu VARIANT=minsize MARCH=arm32v7 CHECK_TARGET=check
- DISTRIB_ID=alpine VARIANT=debug MARCH=x86_64 CHECK_TARGET=check
before_script:
- make -j4 DISTRIB_ID=$DISTRIB_ID VARIANT=$VARIANT MARCH=$MARCH

@ -64,7 +64,7 @@ GENERIC_TARGETS += $(call target_properties_combine,\
,\
builder,\
,\
debug release coverage min_size_rel \
debug release coverage minsize \
)
DOCKER_TARGETS += $(GENERIC_TARGETS)

@ -4,7 +4,15 @@
rm -rf meson
BUILDTYPE="$VARIANT"
COVERAGE=false
if [ "$VARIANT" = "coverage" ]; then
BUILDTYPE="debug"
COVERAGE=true
fi
[ -z "$VERBOSE" ] || set -x
exec meson setup --buildtype "$VARIANT" "${PWD}/meson" "$PROJECTDIR" "$@"
exec meson setup --buildtype "$BUILDTYPE" "-Db_coverage=$COVERAGE" "${PWD}/meson" "$PROJECTDIR" "$@"

Loading…
Cancel
Save