From 4f9dad74fe76911248a3b47a679fb4c66c08ad5d Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Thu, 9 May 2002 16:07:33 +0000 Subject: [PATCH] refcounting tests sure would be nice to have Original commit message from CVS: refcounting tests sure would be nice to have --- tests/old/testsuite/refcounting/Makefile.am | 20 ++++++++----- tests/old/testsuite/refcounting/mem.c | 1 + tests/old/testsuite/refcounting/pad.c | 44 ++++++++++++++--------------- testsuite/refcounting/Makefile.am | 20 ++++++++----- testsuite/refcounting/mem.c | 1 + testsuite/refcounting/pad.c | 44 ++++++++++++++--------------- 6 files changed, 72 insertions(+), 58 deletions(-) diff --git a/tests/old/testsuite/refcounting/Makefile.am b/tests/old/testsuite/refcounting/Makefile.am index 3d98225..28d46da74 100644 --- a/tests/old/testsuite/refcounting/Makefile.am +++ b/tests/old/testsuite/refcounting/Makefile.am @@ -1,17 +1,23 @@ # GstObject is no longer instantiatable in glib2 # neither is GstElement -testprogs = pad +if BUILD_FAILING_TESTS +tests_failing = element +else +tests_failing = +endif +tests_working = bin element_pad pad -# element_SOURCES = element.c mem.c +element_SOURCES = element.c mem.c pad_SOURCES = pad.c mem.c -# element_pad_SOURCES = element_pad.c mem.c -# bin_SOURCES = bin.c mem.c -TESTS = $(testprogs) +element_pad_SOURCES = element_pad.c mem.c +bin_SOURCES = bin.c mem.c -check_PROGRAMS = $(testprogs) +TESTS = $(tests_failing) $(tests_working) -EXTRA_DIST = thread.c object.c element.c element_pad.c bin.c +check_PROGRAMS = $(TESTS) + +EXTRA_DIST = thread.c object.c noinst_HEADERS = mem.h diff --git a/tests/old/testsuite/refcounting/mem.c b/tests/old/testsuite/refcounting/mem.c index 8e1c573..fa1f934 100644 --- a/tests/old/testsuite/refcounting/mem.c +++ b/tests/old/testsuite/refcounting/mem.c @@ -1,5 +1,6 @@ #include #include +#include #include #include diff --git a/tests/old/testsuite/refcounting/pad.c b/tests/old/testsuite/refcounting/pad.c index b308e4e..5193f40 100644 --- a/tests/old/testsuite/refcounting/pad.c +++ b/tests/old/testsuite/refcounting/pad.c @@ -115,18 +115,18 @@ main (int argc, gchar *argv[]) pad2 = gst_pad_new ("padname2", GST_PAD_SRC); gst_pad_connect (pad2, pad); - g_assert (GST_PAD_CONNECTED (pad)); - g_assert (GST_PAD_CONNECTED (pad2)); + g_assert (GST_PAD_IS_CONNECTED (pad)); + g_assert (GST_PAD_IS_CONNECTED (pad2)); gst_pad_disconnect (pad2, pad); - g_assert (!GST_PAD_CONNECTED (pad)); - g_assert (!GST_PAD_CONNECTED (pad2)); + g_assert (!GST_PAD_IS_CONNECTED (pad)); + g_assert (!GST_PAD_IS_CONNECTED (pad2)); g_print ("connect/disconnect pad %ld\n", vmsize()-usage1); gst_pad_connect (pad, pad2); - g_assert (GST_PAD_CONNECTED (pad)); - g_assert (GST_PAD_CONNECTED (pad2)); + g_assert (GST_PAD_IS_CONNECTED (pad)); + g_assert (GST_PAD_IS_CONNECTED (pad2)); gst_pad_disconnect (pad, pad2); - g_assert (!GST_PAD_CONNECTED (pad)); - g_assert (!GST_PAD_CONNECTED (pad2)); + g_assert (!GST_PAD_IS_CONNECTED (pad)); + g_assert (!GST_PAD_IS_CONNECTED (pad2)); g_print ("connect/disconnect pad wrong direction %ld\n", vmsize()-usage1); gst_object_unref (GST_OBJECT (pad)); @@ -148,11 +148,11 @@ main (int argc, gchar *argv[]) pad2 = gst_pad_new ("padname2", GST_PAD_SRC); gst_pad_connect (pad2, pad); - g_assert (GST_PAD_CONNECTED (pad2)); - g_assert (GST_PAD_CONNECTED (pad)); + g_assert (GST_PAD_IS_CONNECTED (pad2)); + g_assert (GST_PAD_IS_CONNECTED (pad)); gst_object_unref (GST_OBJECT (pad2)); - g_assert (!GST_PAD_CONNECTED (pad)); + g_assert (!GST_PAD_IS_CONNECTED (pad)); g_assert (!GST_OBJECT_DESTROYED (pad)); gst_object_unref (GST_OBJECT (pad)); @@ -160,11 +160,11 @@ main (int argc, gchar *argv[]) pad2 = gst_pad_new ("padname2", GST_PAD_SRC); gst_pad_connect (pad2, pad); - g_assert (GST_PAD_CONNECTED (pad2)); - g_assert (GST_PAD_CONNECTED (pad)); + g_assert (GST_PAD_IS_CONNECTED (pad2)); + g_assert (GST_PAD_IS_CONNECTED (pad)); gst_object_unref (GST_OBJECT (pad)); - g_assert (!GST_PAD_CONNECTED (pad2)); + g_assert (!GST_PAD_IS_CONNECTED (pad2)); g_assert (!GST_OBJECT_DESTROYED (pad2)); gst_object_unref (GST_OBJECT (pad2)); @@ -174,32 +174,32 @@ main (int argc, gchar *argv[]) pad2 = gst_pad_new ("padname2", GST_PAD_SRC); gst_pad_connect (pad2, pad); - g_assert (GST_PAD_CONNECTED (pad2)); - g_assert (GST_PAD_CONNECTED (pad)); + g_assert (GST_PAD_IS_CONNECTED (pad2)); + g_assert (GST_PAD_IS_CONNECTED (pad)); gst_object_destroy (GST_OBJECT (pad2)); g_assert (GST_OBJECT_DESTROYED (pad2)); g_assert (!GST_OBJECT_DESTROYED (pad)); - g_assert (!GST_PAD_CONNECTED (pad)); + g_assert (!GST_PAD_IS_CONNECTED (pad)); gst_object_unref (GST_OBJECT (pad2)); g_assert (!GST_OBJECT_DESTROYED (pad)); - g_assert (!GST_PAD_CONNECTED (pad)); + g_assert (!GST_PAD_IS_CONNECTED (pad)); gst_object_unref (GST_OBJECT (pad)); pad = gst_pad_new ("padname", GST_PAD_SINK); pad2 = gst_pad_new ("padname2", GST_PAD_SRC); gst_pad_connect (pad2, pad); - g_assert (GST_PAD_CONNECTED (pad2)); - g_assert (GST_PAD_CONNECTED (pad)); + g_assert (GST_PAD_IS_CONNECTED (pad2)); + g_assert (GST_PAD_IS_CONNECTED (pad)); gst_object_destroy (GST_OBJECT (pad)); g_assert (GST_OBJECT_DESTROYED (pad)); g_assert (!GST_OBJECT_DESTROYED (pad2)); - g_assert (!GST_PAD_CONNECTED (pad2)); + g_assert (!GST_PAD_IS_CONNECTED (pad2)); gst_object_unref (GST_OBJECT (pad)); g_assert (!GST_OBJECT_DESTROYED (pad2)); - g_assert (!GST_PAD_CONNECTED (pad2)); + g_assert (!GST_PAD_IS_CONNECTED (pad2)); gst_object_unref (GST_OBJECT (pad2)); g_print ("pad destroy effects on connect pad ok %ld\n", vmsize()-usage1); diff --git a/testsuite/refcounting/Makefile.am b/testsuite/refcounting/Makefile.am index 3d98225..28d46da74 100644 --- a/testsuite/refcounting/Makefile.am +++ b/testsuite/refcounting/Makefile.am @@ -1,17 +1,23 @@ # GstObject is no longer instantiatable in glib2 # neither is GstElement -testprogs = pad +if BUILD_FAILING_TESTS +tests_failing = element +else +tests_failing = +endif +tests_working = bin element_pad pad -# element_SOURCES = element.c mem.c +element_SOURCES = element.c mem.c pad_SOURCES = pad.c mem.c -# element_pad_SOURCES = element_pad.c mem.c -# bin_SOURCES = bin.c mem.c -TESTS = $(testprogs) +element_pad_SOURCES = element_pad.c mem.c +bin_SOURCES = bin.c mem.c -check_PROGRAMS = $(testprogs) +TESTS = $(tests_failing) $(tests_working) -EXTRA_DIST = thread.c object.c element.c element_pad.c bin.c +check_PROGRAMS = $(TESTS) + +EXTRA_DIST = thread.c object.c noinst_HEADERS = mem.h diff --git a/testsuite/refcounting/mem.c b/testsuite/refcounting/mem.c index 8e1c573..fa1f934 100644 --- a/testsuite/refcounting/mem.c +++ b/testsuite/refcounting/mem.c @@ -1,5 +1,6 @@ #include #include +#include #include #include diff --git a/testsuite/refcounting/pad.c b/testsuite/refcounting/pad.c index b308e4e..5193f40 100644 --- a/testsuite/refcounting/pad.c +++ b/testsuite/refcounting/pad.c @@ -115,18 +115,18 @@ main (int argc, gchar *argv[]) pad2 = gst_pad_new ("padname2", GST_PAD_SRC); gst_pad_connect (pad2, pad); - g_assert (GST_PAD_CONNECTED (pad)); - g_assert (GST_PAD_CONNECTED (pad2)); + g_assert (GST_PAD_IS_CONNECTED (pad)); + g_assert (GST_PAD_IS_CONNECTED (pad2)); gst_pad_disconnect (pad2, pad); - g_assert (!GST_PAD_CONNECTED (pad)); - g_assert (!GST_PAD_CONNECTED (pad2)); + g_assert (!GST_PAD_IS_CONNECTED (pad)); + g_assert (!GST_PAD_IS_CONNECTED (pad2)); g_print ("connect/disconnect pad %ld\n", vmsize()-usage1); gst_pad_connect (pad, pad2); - g_assert (GST_PAD_CONNECTED (pad)); - g_assert (GST_PAD_CONNECTED (pad2)); + g_assert (GST_PAD_IS_CONNECTED (pad)); + g_assert (GST_PAD_IS_CONNECTED (pad2)); gst_pad_disconnect (pad, pad2); - g_assert (!GST_PAD_CONNECTED (pad)); - g_assert (!GST_PAD_CONNECTED (pad2)); + g_assert (!GST_PAD_IS_CONNECTED (pad)); + g_assert (!GST_PAD_IS_CONNECTED (pad2)); g_print ("connect/disconnect pad wrong direction %ld\n", vmsize()-usage1); gst_object_unref (GST_OBJECT (pad)); @@ -148,11 +148,11 @@ main (int argc, gchar *argv[]) pad2 = gst_pad_new ("padname2", GST_PAD_SRC); gst_pad_connect (pad2, pad); - g_assert (GST_PAD_CONNECTED (pad2)); - g_assert (GST_PAD_CONNECTED (pad)); + g_assert (GST_PAD_IS_CONNECTED (pad2)); + g_assert (GST_PAD_IS_CONNECTED (pad)); gst_object_unref (GST_OBJECT (pad2)); - g_assert (!GST_PAD_CONNECTED (pad)); + g_assert (!GST_PAD_IS_CONNECTED (pad)); g_assert (!GST_OBJECT_DESTROYED (pad)); gst_object_unref (GST_OBJECT (pad)); @@ -160,11 +160,11 @@ main (int argc, gchar *argv[]) pad2 = gst_pad_new ("padname2", GST_PAD_SRC); gst_pad_connect (pad2, pad); - g_assert (GST_PAD_CONNECTED (pad2)); - g_assert (GST_PAD_CONNECTED (pad)); + g_assert (GST_PAD_IS_CONNECTED (pad2)); + g_assert (GST_PAD_IS_CONNECTED (pad)); gst_object_unref (GST_OBJECT (pad)); - g_assert (!GST_PAD_CONNECTED (pad2)); + g_assert (!GST_PAD_IS_CONNECTED (pad2)); g_assert (!GST_OBJECT_DESTROYED (pad2)); gst_object_unref (GST_OBJECT (pad2)); @@ -174,32 +174,32 @@ main (int argc, gchar *argv[]) pad2 = gst_pad_new ("padname2", GST_PAD_SRC); gst_pad_connect (pad2, pad); - g_assert (GST_PAD_CONNECTED (pad2)); - g_assert (GST_PAD_CONNECTED (pad)); + g_assert (GST_PAD_IS_CONNECTED (pad2)); + g_assert (GST_PAD_IS_CONNECTED (pad)); gst_object_destroy (GST_OBJECT (pad2)); g_assert (GST_OBJECT_DESTROYED (pad2)); g_assert (!GST_OBJECT_DESTROYED (pad)); - g_assert (!GST_PAD_CONNECTED (pad)); + g_assert (!GST_PAD_IS_CONNECTED (pad)); gst_object_unref (GST_OBJECT (pad2)); g_assert (!GST_OBJECT_DESTROYED (pad)); - g_assert (!GST_PAD_CONNECTED (pad)); + g_assert (!GST_PAD_IS_CONNECTED (pad)); gst_object_unref (GST_OBJECT (pad)); pad = gst_pad_new ("padname", GST_PAD_SINK); pad2 = gst_pad_new ("padname2", GST_PAD_SRC); gst_pad_connect (pad2, pad); - g_assert (GST_PAD_CONNECTED (pad2)); - g_assert (GST_PAD_CONNECTED (pad)); + g_assert (GST_PAD_IS_CONNECTED (pad2)); + g_assert (GST_PAD_IS_CONNECTED (pad)); gst_object_destroy (GST_OBJECT (pad)); g_assert (GST_OBJECT_DESTROYED (pad)); g_assert (!GST_OBJECT_DESTROYED (pad2)); - g_assert (!GST_PAD_CONNECTED (pad2)); + g_assert (!GST_PAD_IS_CONNECTED (pad2)); gst_object_unref (GST_OBJECT (pad)); g_assert (!GST_OBJECT_DESTROYED (pad2)); - g_assert (!GST_PAD_CONNECTED (pad2)); + g_assert (!GST_PAD_IS_CONNECTED (pad2)); gst_object_unref (GST_OBJECT (pad2)); g_print ("pad destroy effects on connect pad ok %ld\n", vmsize()-usage1); -- 2.7.4