From aaddd823bcce4c5f751cb694c7c7d5064978213b Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Thu, 10 Oct 2013 17:23:00 +0400 Subject: [PATCH] Removed obsolete makefile rules Removed test, test-report, full-report, perf-report. They all come from an old (now obsolete) approach toward glib testing[1]. Now the blessed ways to test glib are 'make check' and installed tests. [1]: https://mail.gnome.org/archives/gtk-devel-list/2007-November/msg00000.html https://bugzilla.gnome.org/show_bug.cgi?id=709995 --- docs/Makefile.am | 1 - glib.mk | 59 ++---------------------------------------------- 2 files changed, 2 insertions(+), 58 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 76157afbb..f95636028 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -9,4 +9,3 @@ files: echo $$p; \ done -.PHONY: test test-report perf-report full-report diff --git a/glib.mk b/glib.mk index 75ac2c632..de87d58a1 100644 --- a/glib.mk +++ b/glib.mk @@ -32,70 +32,15 @@ check_DATA = TESTS = -### testing rules - -# test: run all tests in cwd and subdirs -test: test-nonrecursive -if OS_UNIX - @ for subdir in $(SUBDIRS) . ; do \ - test "$$subdir" = "." -o "$$subdir" = "po" || \ - ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \ - done - # test-nonrecursive: run tests only in cwd +if OS_UNIX test-nonrecursive: ${TEST_PROGS} @test -z "${TEST_PROGS}" || G_TEST_SRCDIR="$(abs_srcdir)" G_TEST_BUILDDIR="$(abs_builddir)" 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 -# perf-report: run tests in subdirs with -m perf and generate report -# full-report: like test-report: with -m perf and -m slow -test-report perf-report full-report: ${TEST_PROGS} - @test -z "${TEST_PROGS}" || { \ - case $@ in \ - test-report) test_options="-k";; \ - perf-report) test_options="-k -m=perf";; \ - full-report) test_options="-k -m=perf -m=slow";; \ - esac ; \ - if test -z "$$GTESTER_LOGDIR" ; then \ - G_TEST_SRCDIR="$(abs_srcdir)" G_TEST_BUILDDIR="$(abs_builddir)" ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \ - elif test -n "${TEST_PROGS}" ; then \ - G_TEST_SRCDIR="$(abs_srcdir)" G_TEST_BUILDDIR="$(abs_builddir)" ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \ - fi ; \ - } - @ ignore_logdir=true ; \ - if test -z "$$GTESTER_LOGDIR" ; then \ - 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 ; \ - echo '' >> $@.xml ; \ - echo '' >> $@.xml ; \ - echo ' $(PACKAGE)' >> $@.xml ; \ - echo ' $(VERSION)' >> $@.xml ; \ - echo " $$REVISION" >> $@.xml ; \ - echo '' >> $@.xml ; \ - for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \ - sed '1,1s/^?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \ - done ; \ - echo >> $@.xml ; \ - echo '' >> $@.xml ; \ - rm -rf "$$GTESTER_LOGDIR"/ ; \ - ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \ - } -.PHONY: test test-report perf-report full-report test-nonrecursive +.PHONY: test-nonrecursive .PHONY: lcov genlcov lcov-clean # use recursive makes in order to ignore errors during check