From f42f103a5ccd6e487abc749674881981df8dfac5 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Sat, 20 Aug 2005 14:00:11 +0000 Subject: [PATCH] factor out the common stuff Original commit message from CVS: factor out the common stuff --- ChangeLog | 9 +++++ check/Makefile.am | 49 +++---------------------- check/gst.supp | 80 ----------------------------------------- common | 2 +- tests/check/Makefile.am | 49 +++---------------------- tests/check/gst.supp | 80 ----------------------------------------- 6 files changed, 18 insertions(+), 251 deletions(-) delete mode 100644 check/gst.supp delete mode 100644 tests/check/gst.supp diff --git a/ChangeLog b/ChangeLog index 99e4c750f3..8281df6ccc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-08-20 Thomas Vander Stichele + + * check/Makefile.am: + * check/gst.supp: + * common/Makefile.am: + * common/check.mak: + * common/gst.supp: + factor out some of the common stuff so we can use it + 2005-08-20 Thomas Vander Stichele * check/Makefile.am: diff --git a/check/Makefile.am b/check/Makefile.am index 3aea97639e..104d91055f 100644 --- a/check/Makefile.am +++ b/check/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/common/check.mak + CHECK_REGISTRY=$(top_builddir)/check/test-registry.xml TESTS_ENVIRONMENT=\ @@ -17,12 +19,9 @@ install-pluginLTLIBRARIES: # ths core dumps of some machines have PIDs appended CLEANFILES = core.* test-registry.xml -EXTRA_DIST = gst.supp +SUPPRESSIONS = $(top_srcdir)/common/gst.supp -clean-local: - for i in `find . -name ".libs" -type d`; do \ - rm -rf $$i; \ - done +clean-local: clean-local-check $(CHECK_REGISTRY): $(TESTS_ENVIRONMENT) \ @@ -89,43 +88,3 @@ VALGRIND_TESTS_DISABLE = \ $(top_builddir)/tools/gst-register \ $(TESTS_THREADED) \ $(TESTS_TO_FIX) - -if HAVE_VALGRIND -# hangs spectacularly on some machines, so let's not do this by default yet -check-local-disabled: - make valgrind -else -check-local-disabled: - @true -endif - -# run any given test by running make test.check -%.check: % $(CHECK_REGISTRY) - @$(TESTS_ENVIRONMENT) \ - $* - - -# valgrind any given test by running make test.valgrind -%.valgrind: % $(CHECK_REGISTRY) - @$(TESTS_ENVIRONMENT) \ - libtool --mode=execute \ - $(VALGRIND_PATH) -q --suppressions=$(srcdir)/gst.supp \ - --tool=memcheck --leak-check=yes --trace-children=yes \ - $* - -# valgrind all tests -valgrind: $(TESTS) - @echo "Valgrinding tests ..." - $(TESTS_ENVIRONMENT) $(top_builddir)/tools/gst-register - @failed=0; \ - for t in $(filter-out $(VALGRIND_TESTS_DISABLE),$(TESTS)); do \ - make $$t.valgrind; \ - if test "$$?" -ne 0; then \ - echo "Valgrind error for test $$t"; \ - failed=`expr $$failed + 1`; \ - fi; \ - done; \ - if test "$$failed" -ne 0; then \ - echo "$$failed tests had leaks under valgrind"; \ - false; \ - fi diff --git a/check/gst.supp b/check/gst.supp deleted file mode 100644 index e47a8a01bb..0000000000 --- a/check/gst.supp +++ /dev/null @@ -1,80 +0,0 @@ -### this file contains suppressions for valgrind when running -### the gstreamer unit tests -### it might be useful for wider use as well - - -### glibc suppressions - -# glibc does not deallocate thread-local storage - -{ - - Memcheck:Leak - fun:calloc - fun:_dl_allocate_tls - fun:pthread_create@@GLIBC_2.1 -} - -{ - - Memcheck:Cond - fun:strstr - fun:__pthread_initialize_minimal - obj:/lib/libpthread-*.so - obj:/lib/libpthread-*.so - fun:call_init - fun:_dl_init - obj:/lib/ld-*.so -} - -# a thread-related free problem in glibc from Edgard -{ - __libc_freeres_rw_acess - Memcheck:Addr4 - obj:* - obj:* - obj:* - obj:* - obj:* - fun:__libc_freeres -} - -### glib suppressions - -{ - - Memcheck:Leak - fun:calloc - fun:g_malloc0 - obj:* - obj:* - fun:g_type_init_with_debug_flags - fun:g_type_init - fun:init_pre - fun:init_popt_callback - obj:* - obj:* - fun:poptGetContext - fun:gst_init_check_with_popt_table -} - -### GStreamer suppressions - -# ds is saying he's rewriting the registry anyway -{ - - Memcheck:Leak - fun:malloc - fun:g_malloc - fun:g_strdup - fun:read_string - fun:load_plugin - fun:gst_xml_registry_load - fun:gst_registry_load - fun:_registry_load_func - fun:g_list_foreach - fun:gst_registry_pool_load_all - fun:init_post - fun:init_popt_callback -} - diff --git a/common b/common index 8ff526a316..b7d5fb659c 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 8ff526a316f9b576e727b8e32cba0a53cdec07a6 +Subproject commit b7d5fb659c1720aecd039effd1d87813e4b8fd92 diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 3aea97639e..104d91055f 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/common/check.mak + CHECK_REGISTRY=$(top_builddir)/check/test-registry.xml TESTS_ENVIRONMENT=\ @@ -17,12 +19,9 @@ install-pluginLTLIBRARIES: # ths core dumps of some machines have PIDs appended CLEANFILES = core.* test-registry.xml -EXTRA_DIST = gst.supp +SUPPRESSIONS = $(top_srcdir)/common/gst.supp -clean-local: - for i in `find . -name ".libs" -type d`; do \ - rm -rf $$i; \ - done +clean-local: clean-local-check $(CHECK_REGISTRY): $(TESTS_ENVIRONMENT) \ @@ -89,43 +88,3 @@ VALGRIND_TESTS_DISABLE = \ $(top_builddir)/tools/gst-register \ $(TESTS_THREADED) \ $(TESTS_TO_FIX) - -if HAVE_VALGRIND -# hangs spectacularly on some machines, so let's not do this by default yet -check-local-disabled: - make valgrind -else -check-local-disabled: - @true -endif - -# run any given test by running make test.check -%.check: % $(CHECK_REGISTRY) - @$(TESTS_ENVIRONMENT) \ - $* - - -# valgrind any given test by running make test.valgrind -%.valgrind: % $(CHECK_REGISTRY) - @$(TESTS_ENVIRONMENT) \ - libtool --mode=execute \ - $(VALGRIND_PATH) -q --suppressions=$(srcdir)/gst.supp \ - --tool=memcheck --leak-check=yes --trace-children=yes \ - $* - -# valgrind all tests -valgrind: $(TESTS) - @echo "Valgrinding tests ..." - $(TESTS_ENVIRONMENT) $(top_builddir)/tools/gst-register - @failed=0; \ - for t in $(filter-out $(VALGRIND_TESTS_DISABLE),$(TESTS)); do \ - make $$t.valgrind; \ - if test "$$?" -ne 0; then \ - echo "Valgrind error for test $$t"; \ - failed=`expr $$failed + 1`; \ - fi; \ - done; \ - if test "$$failed" -ne 0; then \ - echo "$$failed tests had leaks under valgrind"; \ - false; \ - fi diff --git a/tests/check/gst.supp b/tests/check/gst.supp deleted file mode 100644 index e47a8a01bb..0000000000 --- a/tests/check/gst.supp +++ /dev/null @@ -1,80 +0,0 @@ -### this file contains suppressions for valgrind when running -### the gstreamer unit tests -### it might be useful for wider use as well - - -### glibc suppressions - -# glibc does not deallocate thread-local storage - -{ - - Memcheck:Leak - fun:calloc - fun:_dl_allocate_tls - fun:pthread_create@@GLIBC_2.1 -} - -{ - - Memcheck:Cond - fun:strstr - fun:__pthread_initialize_minimal - obj:/lib/libpthread-*.so - obj:/lib/libpthread-*.so - fun:call_init - fun:_dl_init - obj:/lib/ld-*.so -} - -# a thread-related free problem in glibc from Edgard -{ - __libc_freeres_rw_acess - Memcheck:Addr4 - obj:* - obj:* - obj:* - obj:* - obj:* - fun:__libc_freeres -} - -### glib suppressions - -{ - - Memcheck:Leak - fun:calloc - fun:g_malloc0 - obj:* - obj:* - fun:g_type_init_with_debug_flags - fun:g_type_init - fun:init_pre - fun:init_popt_callback - obj:* - obj:* - fun:poptGetContext - fun:gst_init_check_with_popt_table -} - -### GStreamer suppressions - -# ds is saying he's rewriting the registry anyway -{ - - Memcheck:Leak - fun:malloc - fun:g_malloc - fun:g_strdup - fun:read_string - fun:load_plugin - fun:gst_xml_registry_load - fun:gst_registry_load - fun:_registry_load_func - fun:g_list_foreach - fun:gst_registry_pool_load_all - fun:init_post - fun:init_popt_callback -} -