From 7d32f5b575c6a4bb6fd09c31ac0e9eb96a918edc Mon Sep 17 00:00:00 2001
From: nosamad <nosamad@users.noreply.github.com>
Date: Sun, 7 Jun 2020 16:56:23 +0200
Subject: [PATCH] fixes buildtype coverage and minsize release

---
 .travis.yml                            |  2 +-
 Makefile                               |  2 +-
 build/dobuild-extensions/meson/prepare | 10 +++++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d662e6d..0b78b99 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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
diff --git a/Makefile b/Makefile
index 79c5802..5883d6c 100644
--- a/Makefile
+++ b/Makefile
@@ -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)
 
diff --git a/build/dobuild-extensions/meson/prepare b/build/dobuild-extensions/meson/prepare
index 6006828..299da54 100755
--- a/build/dobuild-extensions/meson/prepare
+++ b/build/dobuild-extensions/meson/prepare
@@ -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" "$@"