GDBus: make use of reliable async cancellation

[platform/upstream/glib.git] / Makefile.decl

diff --git a/Makefile.decl b/Makefile.decl
index 3b344eb..50cf169 100644 (file)
--- a/Makefile.decl
+++ b/Makefile.decl
@@ -17,12 +17,12 @@ if OS_UNIX
            test "$$subdir" = "." -o "$$subdir" = "po" || \
            ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
          done
-endif
 
 # test-nonrecursive: run tests only in cwd
 test-nonrecursive: ${TEST_PROGS}
-if OS_UNIX
-       @test -z "${TEST_PROGS}" || MALLOC_CHECK_=2 MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) ${GTESTER} --verbose ${TEST_PROGS}
+       @test -z "${TEST_PROGS}" || G_DEBUG=gc-friendly MALLOC_CHECK_=2 MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) ${GTESTER} --verbose ${TEST_PROGS}
+else
+test-nonrecursive:
 endif
 
 # test-report: run tests in subdirs and generate report
@@ -46,17 +46,23 @@ test-report perf-report full-report:        ${TEST_PROGS}
            GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \
            ignore_logdir=false ; \
          fi ; \
+         if test -d "$(top_srcdir)/.git" ; then \
+           REVISION=`git describe` ; \
+         else \
+           REVISION=$(VERSION) ; \
+         fi ; \
          for subdir in $(SUBDIRS) . ; do \
            test "$$subdir" = "." -o "$$subdir" = "po" || \
            ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
          done ; \
          $$ignore_logdir || { \
-           echo '<?xml version="1.0"?>'            > $@.xml ; \
-           echo '<report-collection>'             >> $@.xml ; \
-           echo '<info>'                          >> $@.xml ; \
-           echo '  <package>$(PACKAGE)</package>' >> $@.xml ; \
-           echo '  <version>$(VERSION)</version>' >> $@.xml ; \
-           echo '</info>'                         >> $@.xml ; \
+           echo '<?xml version="1.0"?>'              > $@.xml ; \
+           echo '<report-collection>'               >> $@.xml ; \
+           echo '<info>'                            >> $@.xml ; \
+           echo '  <package>$(PACKAGE)</package>'   >> $@.xml ; \
+           echo '  <version>$(VERSION)</version>'   >> $@.xml ; \
+           echo "  <revision>$$REVISION</revision>" >> $@.xml ; \
+           echo '</info>'                           >> $@.xml ; \
            for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \
              sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \
            done ; \
@@ -78,10 +84,9 @@ lcov:
 # 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
-       $(SED) -e 's#.libs/##' < glib-lcov.info > glib-lcov.info.tmp
-       LANG=C $(LTP_GENHTML) --prefix $(top_builddir) --output-directory glib-lcov --title "GLib Code Coverage" --legend --show-details glib-lcov.info.tmp
-       rm -f glib-lcov.info.tmp
+       $(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
+       @echo "file://$(abs_top_builddir)/glib-lcov/index.html"
 
 lcov-clean:
        -$(LTP) --directory $(top_builddir) -z