Fix error and coverage reporting in tests

Makefile

@@ -38,13 +38,8 @@ install-debian-kernel-support:
 	$(MAKE) -C dracut install
 	$(MAKE) -C grub install-debian
 
-install-gptfix: gptfixer/gpt
-	install -D gptfixer/gpt $(DESTDIR)$(SBINDIR)/gptfix
-gptfixer/gpt_LDLIBS := -lz
-gptfixer/gpt_CFLAGS := -D_GNU_SOURCE -fno-strict-aliasing -fno-delete-null-pointer-checks -fno-strict-overflow
-%: %.c Makefile
-	$(CC) $($(@)_CFLAGS) -o $@ $< $(CFLAGS) -MD -MP -MF $@.dep $($(@)_LDLIBS)
--include gptfixer/*.dep
+install-gptfix:
+	$(MAKE) -C gptfixer install
 
 clean:
 	$(MAKE) -C qrexec-lib clean

debian/rules

@@ -11,6 +11,7 @@ export DESTDIR=$(shell pwd)/debian/tmp
 
 override_dh_auto_build:
 	make all LIBDIR=/usr/lib DEBIANBUILD=1
+	make -C gptfixer all
 
 override_dh_auto_install:
 	make install LIBDIR=/usr/lib DEBIANBUILD=1 PYTHON_PREFIX_ARG=--install-layout=deb

gptfixer/Makefile

@@ -0,0 +1,12 @@
+all: gpt
+
+CFLAGS ?=
+LDLIBS += -lz
+CFLAGS += -D_GNU_SOURCE -fno-strict-aliasing -fno-delete-null-pointer-checks -fno-strict-overflow
+%: %.c Makefile
+	$(CC) -o $@ $< $(CFLAGS) -MD -MP -MF $@.dep $(LDLIBS)
+
+install: gpt
+	install -D gpt $(DESTDIR)$(SBINDIR)/gptfix
+
+-include *.dep

gptfixer/test.sh

@@ -2,7 +2,7 @@
 set -euo pipefail
 
 case $0 in (/*) cd "${0%/*}/";; (*/*) cd "./${0%/*}";; (*) :;; esac
-make -C .. gptfixer/gpt
+make gpt
 chk () {
     loopdev=$(sudo losetup --nooverlap --find --sector-size "$1" --show -- dummy.img)
     if [[ "$loopdev" != '/dev/loop0' ]]; then
@@ -29,7 +29,7 @@ case "$#,${1-}" in
 ('1,update') go 3>&2 > test.sh.stdout 2> test.sh.stderr;;
 (0,)
     tmpdir=$(mktemp -d)
-    go 3>&2 > "$tmpdir/stdout" 2> "$tmpdir/stderr"
+    go 3>&2 > "$tmpdir/stdout" 2> "$tmpdir/stderr" || { cat "$tmpdir/stderr"; exit 1; }
     diff -u -- "$tmpdir/stdout" test.sh.stdout
     diff -u -- "$tmpdir/stderr" test.sh.stderr
     rm -rf -- "$tmpdir"

rpm_spec/qubes-kernel-vm-support.spec.in

@@ -55,7 +55,7 @@ initrd is provided by dom0.
 
 %build
 make -C kernel-modules all
-make gptfixer/gpt
+make -C gptfixer all
 
 %install
 make install-fedora-kernel-support DESTDIR=%{buildroot} SBINDIR=%{_sbindir}