[kdbus] KDBUS_ITEM_PAYLOAD_OFF items are (once again) relative to msg header

[platform/upstream/glib.git] / glib.mk

diff --git a/glib.mk b/glib.mk
index de87d58..09aae0e 100644 (file)
--- a/glib.mk
+++ b/glib.mk
@@ -52,15 +52,16 @@ lcov:
 # placing the objects files in the .libs/ directory separate from the *.c
 # we also have to delete tests/.libs/libmoduletestplugin_*.gcda
 genlcov:
-       rm -f $(top_builddir)/tests/.libs/libmoduletestplugin_*.gcda
-       $(LTP) --directory $(top_builddir) --capture --output-file glib-lcov.info --test-name GLIB_PERF --no-checksum --compat-libtool
-       LANG=C $(LTP_GENHTML) --prefix $(top_builddir) --output-directory glib-lcov --title "GLib Code Coverage" --legend --show-details glib-lcov.info
+       $(AM_V_GEN) rm -f $(top_builddir)/tests/.libs/libmoduletestplugin_*.gcda; \
+         $(LTP) --quiet --directory $(top_builddir) --capture --output-file glib-lcov.info --test-name GLIB_PERF --no-checksum --compat-libtool --ignore-errors source; \
+         $(LTP) --quiet --output-file glib-lcov.info --remove glib-lcov.info docs/reference/\* /tmp/\*  gio/tests/gdbus-object-manager-example/\* ; \
+         LANG=C $(LTP_GENHTML) --quiet --prefix $(top_builddir) --output-directory glib-lcov --title "GLib Code Coverage" --legend --frames --show-details glib-lcov.info --ignore-errors source
        @echo "file://$(abs_top_builddir)/glib-lcov/index.html"
 
 lcov-clean:
-       -$(LTP) --directory $(top_builddir) -z
-       -rm -rf glib-lcov.info glib-lcov
-       -find -name '*.gcda' -print | xargs rm
+       if test -n "$(LTP)"; then \
+         $(LTP) --quiet --directory $(top_builddir) -z; \
+       fi
 
 # run tests in cwd as part of make check
 check-local: test-nonrecursive
@@ -163,7 +164,7 @@ installed_test_meta_DATA = $(installed_testcases:=.test)
 %.test: %$(EXEEXT) Makefile
        $(AM_V_GEN) (echo '[Test]' > $@.tmp; \
        echo 'Type=session' >> $@.tmp; \
-       echo 'Exec=$(installed_testdir)/$<' >> $@.tmp; \
+       echo 'Exec=$(installed_testdir)/$(notdir $<)' >> $@.tmp; \
        mv $@.tmp $@)
 
 CLEANFILES += $(installed_test_meta_DATA)