From cc62cef6fa636b2d636bd518e2e6b19b6e8ff6a1 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Wed, 28 Jul 2004 11:43:04 +0000 Subject: [PATCH] fold enumcaps into caps/; clean up Makefile.am files Original commit message from CVS: fold enumcaps into caps/; clean up Makefile.am files --- ChangeLog | 28 +++++++++ configure.ac | 1 - tests/old/testsuite/Makefile.am | 2 +- tests/old/testsuite/bins/Makefile.am | 2 - tests/old/testsuite/caps/Makefile.am | 35 +---------- tests/old/testsuite/cleanup/Makefile.am | 12 ---- tests/old/testsuite/clock/Makefile.am | 1 - tests/old/testsuite/debug/Makefile.am | 2 - tests/old/testsuite/dlopen/Makefile.am | 10 +-- tests/old/testsuite/dynparams/Makefile.am | 4 -- tests/old/testsuite/elements/.gitignore | 2 +- tests/old/testsuite/elements/Makefile.am | 3 - tests/old/testsuite/enumcaps/Makefile.am | 7 --- tests/old/testsuite/enumcaps/enumcaps.c | 95 ----------------------------- tests/old/testsuite/ghostpads/Makefile.am | 3 - tests/old/testsuite/indexers/Makefile.am | 2 - tests/old/testsuite/negotiation/Makefile.am | 2 - tests/old/testsuite/parse/Makefile.am | 4 -- tests/old/testsuite/plugin/Makefile.am | 5 -- tests/old/testsuite/refcounting/Makefile.am | 2 - tests/old/testsuite/schedulers/.gitignore | 5 ++ tests/old/testsuite/states/Makefile.am | 5 -- tests/old/testsuite/tags/Makefile.am | 3 - tests/old/testsuite/threads/Makefile.am | 3 - testsuite/Makefile.am | 2 +- testsuite/bins/Makefile.am | 2 - testsuite/caps/Makefile.am | 35 +---------- testsuite/cleanup/Makefile.am | 12 ---- testsuite/clock/Makefile.am | 1 - testsuite/debug/Makefile.am | 2 - testsuite/dlopen/Makefile.am | 10 +-- testsuite/dynparams/Makefile.am | 4 -- testsuite/elements/.gitignore | 2 +- testsuite/elements/Makefile.am | 3 - testsuite/enumcaps/Makefile.am | 7 --- testsuite/enumcaps/enumcaps.c | 95 ----------------------------- testsuite/ghostpads/Makefile.am | 3 - testsuite/indexers/Makefile.am | 2 - testsuite/negotiation/Makefile.am | 2 - testsuite/parse/Makefile.am | 4 -- testsuite/plugin/Makefile.am | 5 -- testsuite/refcounting/Makefile.am | 2 - testsuite/schedulers/.gitignore | 5 ++ testsuite/states/Makefile.am | 5 -- testsuite/tags/Makefile.am | 3 - testsuite/threads/Makefile.am | 3 - 46 files changed, 50 insertions(+), 397 deletions(-) delete mode 100644 tests/old/testsuite/enumcaps/Makefile.am delete mode 100644 tests/old/testsuite/enumcaps/enumcaps.c delete mode 100644 testsuite/enumcaps/Makefile.am delete mode 100644 testsuite/enumcaps/enumcaps.c diff --git a/ChangeLog b/ChangeLog index c82d101..98dc21f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,33 @@ 2004-07-28 Thomas Vander Stichele + * configure.ac: + * testsuite/Makefile.am: + * testsuite/bins/Makefile.am: + * testsuite/caps/Makefile.am: + * testsuite/cleanup/Makefile.am: + * testsuite/clock/Makefile.am: + * testsuite/debug/Makefile.am: + * testsuite/dlopen/Makefile.am: + * testsuite/dynparams/Makefile.am: + * testsuite/elements/.cvsignore: + * testsuite/elements/Makefile.am: + * testsuite/enumcaps/Makefile.am: + * testsuite/enumcaps/enumcaps.c: + * testsuite/ghostpads/Makefile.am: + * testsuite/indexers/Makefile.am: + * testsuite/negotiation/Makefile.am: + * testsuite/parse/Makefile.am: + * testsuite/plugin/Makefile.am: + * testsuite/refcounting/Makefile.am: + * testsuite/schedulers/.cvsignore: + * testsuite/states/Makefile.am: + * testsuite/tags/Makefile.am: + * testsuite/threads/Makefile.am: + fold enumcaps into caps dir + clean up Makefile.am's for testsuite + +2004-07-28 Thomas Vander Stichele + * docs/gst/Makefile.am: * docs/libs/Makefile.am: clean up docs build. Fixes needless rebuilding of template files. diff --git a/configure.ac b/configure.ac index 2d2b1b8..8a5f1fe 100644 --- a/configure.ac +++ b/configure.ac @@ -672,7 +672,6 @@ testsuite/debug/Makefile testsuite/dlopen/Makefile testsuite/dynparams/Makefile testsuite/elements/Makefile -testsuite/enumcaps/Makefile testsuite/ghostpads/Makefile testsuite/indexers/Makefile testsuite/negotiation/Makefile diff --git a/tests/old/testsuite/Makefile.am b/tests/old/testsuite/Makefile.am index 0b91e87..a59d204 100644 --- a/tests/old/testsuite/Makefile.am +++ b/tests/old/testsuite/Makefile.am @@ -17,7 +17,7 @@ SUBDIRS = \ bins bytestream caps cleanup clock \ $(GST_DEBUG_DIRS) \ dlopen dynparams \ - elements enumcaps ghostpads indexers negotiation \ + elements ghostpads indexers negotiation \ $(GST_PARSE_DIRS) \ plugin refcounting schedulers states tags threads diff --git a/tests/old/testsuite/bins/Makefile.am b/tests/old/testsuite/bins/Makefile.am index cad8df9..265f5ca 100644 --- a/tests/old/testsuite/bins/Makefile.am +++ b/tests/old/testsuite/bins/Makefile.am @@ -3,5 +3,3 @@ include ../Rules tests_pass = interface tests_fail = tests_ignore = - -interface_SOURCES = interface.c diff --git a/tests/old/testsuite/caps/Makefile.am b/tests/old/testsuite/caps/Makefile.am index 8d961d6..d6fb78a 100644 --- a/tests/old/testsuite/caps/Makefile.am +++ b/tests/old/testsuite/caps/Makefile.am @@ -1,8 +1,8 @@ include ../Rules - tests_pass = \ app_fixate \ + enumcaps \ intersection \ compatibility \ deserialize \ @@ -34,36 +34,3 @@ noinst_HEADERS = \ tests_fail = tests_ignore = - -app_fixate_LDADD = $(GST_OBJ_LIBS) -app_fixate_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) -intersection_LDADD = $(GST_OBJ_LIBS) -intersection_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) -compatibility_LDADD = $(GST_OBJ_LIBS) -compatibility_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) -deserialize_LDADD = $(GST_OBJ_LIBS) -deserialize_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) -normalisation_LDADD = $(GST_OBJ_LIBS) -normalisation_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) -union_LDADD = $(GST_OBJ_LIBS) -union_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) -string_conversions_LDADD = $(GST_OBJ_LIBS) -string_conversions_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) -fixed_LDADD = $(GST_OBJ_LIBS) -fixed_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) -intersect2_LDADD = $(GST_OBJ_LIBS) -intersect2_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) -filtercaps_LDADD = $(GST_OBJ_LIBS) -filtercaps_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) -eratosthenes_LDADD = $(GST_OBJ_LIBS) -ersthostenes_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) -subtract_LDADD = $(GST_OBJ_LIBS) -subtract_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) -sets_LDADD = $(GST_OBJ_LIBS) -sets_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) -simplify_LDADD = $(GST_OBJ_LIBS) -simplify_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) -renegotiate_LDADD = $(GST_OBJ_LIBS) -renegotiate_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) -random_LDADD = $(GST_OBJ_LIBS) -random_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) diff --git a/tests/old/testsuite/cleanup/Makefile.am b/tests/old/testsuite/cleanup/Makefile.am index 0887789..ba1e603 100644 --- a/tests/old/testsuite/cleanup/Makefile.am +++ b/tests/old/testsuite/cleanup/Makefile.am @@ -5,15 +5,3 @@ tests_fail = # cleanup3 fails depending on the machine tests_ignore = cleanup3 - -# we have nothing but apps here, we can do this safely -cleanup1_LDADD = $(GST_OBJ_LIBS) -cleanup1_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) -cleanup2_LDADD = $(GST_OBJ_LIBS) -cleanup2_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) -#cleanup3_LDADD = $(GST_OBJ_LIBS) -#cleanup3_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) -cleanup4_LDADD = $(GST_OBJ_LIBS) -cleanup4_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) -cleanup5_LDADD = $(GST_OBJ_LIBS) -cleanup5_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) diff --git a/tests/old/testsuite/clock/Makefile.am b/tests/old/testsuite/clock/Makefile.am index ffa2a73..d7ed02b 100644 --- a/tests/old/testsuite/clock/Makefile.am +++ b/tests/old/testsuite/clock/Makefile.am @@ -3,4 +3,3 @@ include ../Rules tests_pass = signedness clock1 clock2 tests_fail = tests_ignore = - diff --git a/tests/old/testsuite/debug/Makefile.am b/tests/old/testsuite/debug/Makefile.am index 2eb6484..b38ca39 100644 --- a/tests/old/testsuite/debug/Makefile.am +++ b/tests/old/testsuite/debug/Makefile.am @@ -2,6 +2,4 @@ include ../Rules tests_pass = commandline category output printf_extension tests_fail = - tests_ignore = global - diff --git a/tests/old/testsuite/dlopen/Makefile.am b/tests/old/testsuite/dlopen/Makefile.am index 01f6f49..646d3a7 100644 --- a/tests/old/testsuite/dlopen/Makefile.am +++ b/tests/old/testsuite/dlopen/Makefile.am @@ -1,3 +1,5 @@ +# ../Rules is not included because we specifically don't want the normal +# AM_CFLAGS, etc. plugin_LTLIBRARIES = libloadgst.la @@ -9,15 +11,10 @@ libloadgst_la_SOURCES = loadgst.c libloadgst_la_CFLAGS = $(GST_OBJ_CFLAGS) libloadgst_la_LDFLAGS = -module -avoid-version $(GST_OBJ_LIBS) -dlopen_gst_SOURCES = dlopen_gst.c dlopen_gst_CFLAGS = $(GLIB_CFLAGS) dlopen_gst_LDFLAGS = $(GLIB_LIBS) - -# ../Rules is included because we specifically don't want the normal -# AM_CFLAGS, etc. - -TESTS_ENVIRONMENT=\ +TESTS_ENVIRONMENT= \ G_DEBUG=fatal_warnings \ GST_PLUGIN_PATH=$(top_builddir)/gst:. \ GST_REGISTRY=$(top_builddir)/testsuite/test-registry.xml @@ -42,4 +39,3 @@ install-pluginLTLIBRARIES: # This rule is here so make distcheck works on machines where core # dumps have PIDs appended CLEANFILES = core.* - diff --git a/tests/old/testsuite/dynparams/Makefile.am b/tests/old/testsuite/dynparams/Makefile.am index 7b11b55..070a514 100644 --- a/tests/old/testsuite/dynparams/Makefile.am +++ b/tests/old/testsuite/dynparams/Makefile.am @@ -4,8 +4,4 @@ tests_pass = dparamstest tests_fail = tests_ignore = -dparamstest_CFLAGS = $(GST_OBJ_CFLAGS) -dparamstest_LDFLAGS = $(GST_OBJ_LIBS) dparamstest_LDADD = $(top_builddir)/libs/gst/control/libgstcontrol-@GST_MAJORMINOR@.la - -dparamstest_SOURCES = dparamstest.c diff --git a/tests/old/testsuite/elements/.gitignore b/tests/old/testsuite/elements/.gitignore index 032742e..9a985c2 100644 --- a/tests/old/testsuite/elements/.gitignore +++ b/tests/old/testsuite/elements/.gitignore @@ -12,4 +12,4 @@ property tee gst-inspect-check gst-compprep-check - +static diff --git a/tests/old/testsuite/elements/Makefile.am b/tests/old/testsuite/elements/Makefile.am index 5e1060f..20081d8 100644 --- a/tests/old/testsuite/elements/Makefile.am +++ b/tests/old/testsuite/elements/Makefile.am @@ -1,6 +1,5 @@ include ../Rules - # disable gst-compprep-check until it doesn't leave stray files for distcheck tests_pass = name tee property fake gst-inspect-check tests_fail = @@ -8,7 +7,6 @@ tests_ignore = noinst_HEADERS = property.h - gst_inspect_check_SOURCES = gst-inspect-check$(EXEEXT): $(srcdir)/gst-inspect-check.in sed s/@[G]ST_MAJORMINOR@/@GST_MAJORMINOR@/ \ @@ -20,4 +18,3 @@ gst-inspect-check$(EXEEXT): $(srcdir)/gst-inspect-check.in # cp $(srcdir)/gst-compprep-check.in gst-compprep-check$(EXEEXT) EXTRA_DIST = gst-inspect-check.in gst-compprep-check.in - diff --git a/tests/old/testsuite/enumcaps/Makefile.am b/tests/old/testsuite/enumcaps/Makefile.am deleted file mode 100644 index 8d12cd0..0000000 --- a/tests/old/testsuite/enumcaps/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -include ../Rules - -tests_pass = enumcaps -tests_fail = -tests_ignore = - - diff --git a/tests/old/testsuite/enumcaps/enumcaps.c b/tests/old/testsuite/enumcaps/enumcaps.c deleted file mode 100644 index 7585333..0000000 --- a/tests/old/testsuite/enumcaps/enumcaps.c +++ /dev/null @@ -1,95 +0,0 @@ -/* GStreamer test - * (c) 2004 Ronald Bultje - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include - -typedef enum -{ - TEST_YES, - TEST_NO -} -TestBool; - -#define TEST_BOOL_TYPE (test_bool_get_type ()) -GType -test_bool_get_type (void) -{ - static GType etype = 0; - - if (etype == 0) { - static const GEnumValue values[] = { - {TEST_YES, "TEST_YES", "yes"}, - {TEST_NO, "TEST_NO", "no"}, - {0, NULL, NULL} - }; - - etype = g_enum_register_static ("TestBool", values); - } - return etype; -} - -gint -main (gint argc, gchar * argv[]) -{ - gchar *str; - GstCaps *caps, *res_caps; - GstStructure *strc; - GValue value = { 0 }; - TestBool yes, no; - - /* register multichannel type */ - gst_init (&argc, &argv); - test_bool_get_type (); - - /* test some caps */ - caps = gst_caps_new_simple ("application/x-gst-test", NULL); - str = gst_caps_to_string (caps); - g_assert (str); - g_free (str); - - /* set enums in list */ - strc = gst_caps_get_structure (caps, 0); - g_value_init (&value, TEST_BOOL_TYPE); - g_value_set_enum (&value, TEST_YES); - gst_structure_set_value (strc, "yes", &value); - g_value_set_enum (&value, TEST_NO); - gst_structure_set_value (strc, "no", &value); - g_value_unset (&value); - - /* test to-/from-string conversions for enums */ - str = gst_caps_to_string (caps); - g_assert (str); - res_caps = gst_caps_from_string (str); - g_free (str); - - /* see if all worked */ - strc = gst_caps_get_structure (res_caps, 0); - yes = g_value_get_enum (gst_structure_get_value (strc, "yes")); - no = g_value_get_enum (gst_structure_get_value (strc, "no")); - g_assert (yes == TEST_YES && no == TEST_NO); - gst_caps_free (caps); - gst_caps_free (res_caps); - - /* yes */ - return 0; -} diff --git a/tests/old/testsuite/ghostpads/Makefile.am b/tests/old/testsuite/ghostpads/Makefile.am index 0b67b7b..438055d 100644 --- a/tests/old/testsuite/ghostpads/Makefile.am +++ b/tests/old/testsuite/ghostpads/Makefile.am @@ -3,6 +3,3 @@ include ../Rules tests_pass = ghostpads tests_fail = tests_ignore = - -ghostpads_SOURCES = ghostpads.c - diff --git a/tests/old/testsuite/indexers/Makefile.am b/tests/old/testsuite/indexers/Makefile.am index 2a4f55d..829c2fd 100644 --- a/tests/old/testsuite/indexers/Makefile.am +++ b/tests/old/testsuite/indexers/Makefile.am @@ -3,5 +3,3 @@ include ../Rules tests_pass = cache1 indexdump tests_fail = tests_ignore = - - diff --git a/tests/old/testsuite/negotiation/Makefile.am b/tests/old/testsuite/negotiation/Makefile.am index daa2617..1534732 100644 --- a/tests/old/testsuite/negotiation/Makefile.am +++ b/tests/old/testsuite/negotiation/Makefile.am @@ -3,5 +3,3 @@ include ../Rules tests_pass = pad_link tests_fail = tests_ignore = - - diff --git a/tests/old/testsuite/parse/Makefile.am b/tests/old/testsuite/parse/Makefile.am index d7d90a4..0b71559 100644 --- a/tests/old/testsuite/parse/Makefile.am +++ b/tests/old/testsuite/parse/Makefile.am @@ -3,7 +3,3 @@ include ../Rules tests_pass = parse1 parse2 tests_fail = tests_ignore = - -parse1_SOURCES = parse1.c -parse2_SOURCES = parse2.c - diff --git a/tests/old/testsuite/plugin/Makefile.am b/tests/old/testsuite/plugin/Makefile.am index 0c337a1..803c384 100644 --- a/tests/old/testsuite/plugin/Makefile.am +++ b/tests/old/testsuite/plugin/Makefile.am @@ -1,4 +1,3 @@ - include ../Rules plugin_LTLIBRARIES = libtestplugin.la libtestplugin2.la @@ -7,7 +6,6 @@ tests_pass = dynamic linked loading registry static static2 tests_fail = tests_ignore = - libtestplugin_la_SOURCES = testplugin.c libtestplugin_la_CFLAGS = $(GST_OBJ_CFLAGS) libtestplugin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) @@ -16,6 +14,3 @@ libtestplugin2_la_CFLAGS = $(GST_OBJ_CFLAGS) libtestplugin2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) linked_LIBS = libtestplugin.la libtestplugin2.la - -static_SOURCES = static.c - diff --git a/tests/old/testsuite/refcounting/Makefile.am b/tests/old/testsuite/refcounting/Makefile.am index ab33678..0a0ed82 100644 --- a/tests/old/testsuite/refcounting/Makefile.am +++ b/tests/old/testsuite/refcounting/Makefile.am @@ -12,5 +12,3 @@ bin_SOURCES = bin.c mem.c EXTRA_DIST = thread.c object.c noinst_HEADERS = mem.h - - diff --git a/tests/old/testsuite/schedulers/.gitignore b/tests/old/testsuite/schedulers/.gitignore index 4d4e0e4..7c522d1 100644 --- a/tests/old/testsuite/schedulers/.gitignore +++ b/tests/old/testsuite/schedulers/.gitignore @@ -7,3 +7,8 @@ unref_src useless_iteration 143777 143777-2 +142183 +142183-2 +147713 +147819 +147894 diff --git a/tests/old/testsuite/states/Makefile.am b/tests/old/testsuite/states/Makefile.am index def43ba..0b9ce66 100644 --- a/tests/old/testsuite/states/Makefile.am +++ b/tests/old/testsuite/states/Makefile.am @@ -3,8 +3,3 @@ include ../Rules tests_pass = locked parent bin tests_fail = tests_ignore = - - -locked_LDADD = $(GST_OBJ_LIBS) -locked_CFLAGS = $(GST_OBJ_CFLAGS) $(GNOME_CFLAGS) $(XML_CFLAGS) - diff --git a/tests/old/testsuite/tags/Makefile.am b/tests/old/testsuite/tags/Makefile.am index 7aa89f3..ecb33ae 100644 --- a/tests/old/testsuite/tags/Makefile.am +++ b/tests/old/testsuite/tags/Makefile.am @@ -3,6 +3,3 @@ include ../Rules tests_pass = merge tests_fail = tests_ignore = - -merge_SOURCES = merge.c - diff --git a/tests/old/testsuite/threads/Makefile.am b/tests/old/testsuite/threads/Makefile.am index e146c83..1d0c260 100644 --- a/tests/old/testsuite/threads/Makefile.am +++ b/tests/old/testsuite/threads/Makefile.am @@ -5,9 +5,6 @@ tests_fail = thread5 threadd threadg tests_ignore = queue threade threadb threadc -queue_SOURCES = queue.c -queue_CFLAGS = $(AM_CFLAGS) - thread1_SOURCES = thread.c thread1_CFLAGS = -DTESTNUM=1 $(AM_CFLAGS) thread2_SOURCES = thread.c diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am index 0b91e87..a59d204 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -17,7 +17,7 @@ SUBDIRS = \ bins bytestream caps cleanup clock \ $(GST_DEBUG_DIRS) \ dlopen dynparams \ - elements enumcaps ghostpads indexers negotiation \ + elements ghostpads indexers negotiation \ $(GST_PARSE_DIRS) \ plugin refcounting schedulers states tags threads diff --git a/testsuite/bins/Makefile.am b/testsuite/bins/Makefile.am index cad8df9..265f5ca 100644 --- a/testsuite/bins/Makefile.am +++ b/testsuite/bins/Makefile.am @@ -3,5 +3,3 @@ include ../Rules tests_pass = interface tests_fail = tests_ignore = - -interface_SOURCES = interface.c diff --git a/testsuite/caps/Makefile.am b/testsuite/caps/Makefile.am index 8d961d6..d6fb78a 100644 --- a/testsuite/caps/Makefile.am +++ b/testsuite/caps/Makefile.am @@ -1,8 +1,8 @@ include ../Rules - tests_pass = \ app_fixate \ + enumcaps \ intersection \ compatibility \ deserialize \ @@ -34,36 +34,3 @@ noinst_HEADERS = \ tests_fail = tests_ignore = - -app_fixate_LDADD = $(GST_OBJ_LIBS) -app_fixate_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) -intersection_LDADD = $(GST_OBJ_LIBS) -intersection_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) -compatibility_LDADD = $(GST_OBJ_LIBS) -compatibility_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) -deserialize_LDADD = $(GST_OBJ_LIBS) -deserialize_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) -normalisation_LDADD = $(GST_OBJ_LIBS) -normalisation_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) -union_LDADD = $(GST_OBJ_LIBS) -union_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) -string_conversions_LDADD = $(GST_OBJ_LIBS) -string_conversions_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) -fixed_LDADD = $(GST_OBJ_LIBS) -fixed_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) -intersect2_LDADD = $(GST_OBJ_LIBS) -intersect2_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) -filtercaps_LDADD = $(GST_OBJ_LIBS) -filtercaps_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) -eratosthenes_LDADD = $(GST_OBJ_LIBS) -ersthostenes_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) -subtract_LDADD = $(GST_OBJ_LIBS) -subtract_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) -sets_LDADD = $(GST_OBJ_LIBS) -sets_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) -simplify_LDADD = $(GST_OBJ_LIBS) -simplify_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) -renegotiate_LDADD = $(GST_OBJ_LIBS) -renegotiate_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) -random_LDADD = $(GST_OBJ_LIBS) -random_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) diff --git a/testsuite/cleanup/Makefile.am b/testsuite/cleanup/Makefile.am index 0887789..ba1e603 100644 --- a/testsuite/cleanup/Makefile.am +++ b/testsuite/cleanup/Makefile.am @@ -5,15 +5,3 @@ tests_fail = # cleanup3 fails depending on the machine tests_ignore = cleanup3 - -# we have nothing but apps here, we can do this safely -cleanup1_LDADD = $(GST_OBJ_LIBS) -cleanup1_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) -cleanup2_LDADD = $(GST_OBJ_LIBS) -cleanup2_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) -#cleanup3_LDADD = $(GST_OBJ_LIBS) -#cleanup3_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) -cleanup4_LDADD = $(GST_OBJ_LIBS) -cleanup4_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) -cleanup5_LDADD = $(GST_OBJ_LIBS) -cleanup5_CFLAGS = $(GST_OBJ_CFLAGS) $(XML_CFLAGS) $(GLIB_CFLAGS) diff --git a/testsuite/clock/Makefile.am b/testsuite/clock/Makefile.am index ffa2a73..d7ed02b 100644 --- a/testsuite/clock/Makefile.am +++ b/testsuite/clock/Makefile.am @@ -3,4 +3,3 @@ include ../Rules tests_pass = signedness clock1 clock2 tests_fail = tests_ignore = - diff --git a/testsuite/debug/Makefile.am b/testsuite/debug/Makefile.am index 2eb6484..b38ca39 100644 --- a/testsuite/debug/Makefile.am +++ b/testsuite/debug/Makefile.am @@ -2,6 +2,4 @@ include ../Rules tests_pass = commandline category output printf_extension tests_fail = - tests_ignore = global - diff --git a/testsuite/dlopen/Makefile.am b/testsuite/dlopen/Makefile.am index 01f6f49..646d3a7 100644 --- a/testsuite/dlopen/Makefile.am +++ b/testsuite/dlopen/Makefile.am @@ -1,3 +1,5 @@ +# ../Rules is not included because we specifically don't want the normal +# AM_CFLAGS, etc. plugin_LTLIBRARIES = libloadgst.la @@ -9,15 +11,10 @@ libloadgst_la_SOURCES = loadgst.c libloadgst_la_CFLAGS = $(GST_OBJ_CFLAGS) libloadgst_la_LDFLAGS = -module -avoid-version $(GST_OBJ_LIBS) -dlopen_gst_SOURCES = dlopen_gst.c dlopen_gst_CFLAGS = $(GLIB_CFLAGS) dlopen_gst_LDFLAGS = $(GLIB_LIBS) - -# ../Rules is included because we specifically don't want the normal -# AM_CFLAGS, etc. - -TESTS_ENVIRONMENT=\ +TESTS_ENVIRONMENT= \ G_DEBUG=fatal_warnings \ GST_PLUGIN_PATH=$(top_builddir)/gst:. \ GST_REGISTRY=$(top_builddir)/testsuite/test-registry.xml @@ -42,4 +39,3 @@ install-pluginLTLIBRARIES: # This rule is here so make distcheck works on machines where core # dumps have PIDs appended CLEANFILES = core.* - diff --git a/testsuite/dynparams/Makefile.am b/testsuite/dynparams/Makefile.am index 7b11b55..070a514 100644 --- a/testsuite/dynparams/Makefile.am +++ b/testsuite/dynparams/Makefile.am @@ -4,8 +4,4 @@ tests_pass = dparamstest tests_fail = tests_ignore = -dparamstest_CFLAGS = $(GST_OBJ_CFLAGS) -dparamstest_LDFLAGS = $(GST_OBJ_LIBS) dparamstest_LDADD = $(top_builddir)/libs/gst/control/libgstcontrol-@GST_MAJORMINOR@.la - -dparamstest_SOURCES = dparamstest.c diff --git a/testsuite/elements/.gitignore b/testsuite/elements/.gitignore index 032742e..9a985c2 100644 --- a/testsuite/elements/.gitignore +++ b/testsuite/elements/.gitignore @@ -12,4 +12,4 @@ property tee gst-inspect-check gst-compprep-check - +static diff --git a/testsuite/elements/Makefile.am b/testsuite/elements/Makefile.am index 5e1060f..20081d8 100644 --- a/testsuite/elements/Makefile.am +++ b/testsuite/elements/Makefile.am @@ -1,6 +1,5 @@ include ../Rules - # disable gst-compprep-check until it doesn't leave stray files for distcheck tests_pass = name tee property fake gst-inspect-check tests_fail = @@ -8,7 +7,6 @@ tests_ignore = noinst_HEADERS = property.h - gst_inspect_check_SOURCES = gst-inspect-check$(EXEEXT): $(srcdir)/gst-inspect-check.in sed s/@[G]ST_MAJORMINOR@/@GST_MAJORMINOR@/ \ @@ -20,4 +18,3 @@ gst-inspect-check$(EXEEXT): $(srcdir)/gst-inspect-check.in # cp $(srcdir)/gst-compprep-check.in gst-compprep-check$(EXEEXT) EXTRA_DIST = gst-inspect-check.in gst-compprep-check.in - diff --git a/testsuite/enumcaps/Makefile.am b/testsuite/enumcaps/Makefile.am deleted file mode 100644 index 8d12cd0..0000000 --- a/testsuite/enumcaps/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -include ../Rules - -tests_pass = enumcaps -tests_fail = -tests_ignore = - - diff --git a/testsuite/enumcaps/enumcaps.c b/testsuite/enumcaps/enumcaps.c deleted file mode 100644 index 7585333..0000000 --- a/testsuite/enumcaps/enumcaps.c +++ /dev/null @@ -1,95 +0,0 @@ -/* GStreamer test - * (c) 2004 Ronald Bultje - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include - -typedef enum -{ - TEST_YES, - TEST_NO -} -TestBool; - -#define TEST_BOOL_TYPE (test_bool_get_type ()) -GType -test_bool_get_type (void) -{ - static GType etype = 0; - - if (etype == 0) { - static const GEnumValue values[] = { - {TEST_YES, "TEST_YES", "yes"}, - {TEST_NO, "TEST_NO", "no"}, - {0, NULL, NULL} - }; - - etype = g_enum_register_static ("TestBool", values); - } - return etype; -} - -gint -main (gint argc, gchar * argv[]) -{ - gchar *str; - GstCaps *caps, *res_caps; - GstStructure *strc; - GValue value = { 0 }; - TestBool yes, no; - - /* register multichannel type */ - gst_init (&argc, &argv); - test_bool_get_type (); - - /* test some caps */ - caps = gst_caps_new_simple ("application/x-gst-test", NULL); - str = gst_caps_to_string (caps); - g_assert (str); - g_free (str); - - /* set enums in list */ - strc = gst_caps_get_structure (caps, 0); - g_value_init (&value, TEST_BOOL_TYPE); - g_value_set_enum (&value, TEST_YES); - gst_structure_set_value (strc, "yes", &value); - g_value_set_enum (&value, TEST_NO); - gst_structure_set_value (strc, "no", &value); - g_value_unset (&value); - - /* test to-/from-string conversions for enums */ - str = gst_caps_to_string (caps); - g_assert (str); - res_caps = gst_caps_from_string (str); - g_free (str); - - /* see if all worked */ - strc = gst_caps_get_structure (res_caps, 0); - yes = g_value_get_enum (gst_structure_get_value (strc, "yes")); - no = g_value_get_enum (gst_structure_get_value (strc, "no")); - g_assert (yes == TEST_YES && no == TEST_NO); - gst_caps_free (caps); - gst_caps_free (res_caps); - - /* yes */ - return 0; -} diff --git a/testsuite/ghostpads/Makefile.am b/testsuite/ghostpads/Makefile.am index 0b67b7b..438055d 100644 --- a/testsuite/ghostpads/Makefile.am +++ b/testsuite/ghostpads/Makefile.am @@ -3,6 +3,3 @@ include ../Rules tests_pass = ghostpads tests_fail = tests_ignore = - -ghostpads_SOURCES = ghostpads.c - diff --git a/testsuite/indexers/Makefile.am b/testsuite/indexers/Makefile.am index 2a4f55d..829c2fd 100644 --- a/testsuite/indexers/Makefile.am +++ b/testsuite/indexers/Makefile.am @@ -3,5 +3,3 @@ include ../Rules tests_pass = cache1 indexdump tests_fail = tests_ignore = - - diff --git a/testsuite/negotiation/Makefile.am b/testsuite/negotiation/Makefile.am index daa2617..1534732 100644 --- a/testsuite/negotiation/Makefile.am +++ b/testsuite/negotiation/Makefile.am @@ -3,5 +3,3 @@ include ../Rules tests_pass = pad_link tests_fail = tests_ignore = - - diff --git a/testsuite/parse/Makefile.am b/testsuite/parse/Makefile.am index d7d90a4..0b71559 100644 --- a/testsuite/parse/Makefile.am +++ b/testsuite/parse/Makefile.am @@ -3,7 +3,3 @@ include ../Rules tests_pass = parse1 parse2 tests_fail = tests_ignore = - -parse1_SOURCES = parse1.c -parse2_SOURCES = parse2.c - diff --git a/testsuite/plugin/Makefile.am b/testsuite/plugin/Makefile.am index 0c337a1..803c384 100644 --- a/testsuite/plugin/Makefile.am +++ b/testsuite/plugin/Makefile.am @@ -1,4 +1,3 @@ - include ../Rules plugin_LTLIBRARIES = libtestplugin.la libtestplugin2.la @@ -7,7 +6,6 @@ tests_pass = dynamic linked loading registry static static2 tests_fail = tests_ignore = - libtestplugin_la_SOURCES = testplugin.c libtestplugin_la_CFLAGS = $(GST_OBJ_CFLAGS) libtestplugin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) @@ -16,6 +14,3 @@ libtestplugin2_la_CFLAGS = $(GST_OBJ_CFLAGS) libtestplugin2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) linked_LIBS = libtestplugin.la libtestplugin2.la - -static_SOURCES = static.c - diff --git a/testsuite/refcounting/Makefile.am b/testsuite/refcounting/Makefile.am index ab33678..0a0ed82 100644 --- a/testsuite/refcounting/Makefile.am +++ b/testsuite/refcounting/Makefile.am @@ -12,5 +12,3 @@ bin_SOURCES = bin.c mem.c EXTRA_DIST = thread.c object.c noinst_HEADERS = mem.h - - diff --git a/testsuite/schedulers/.gitignore b/testsuite/schedulers/.gitignore index 4d4e0e4..7c522d1 100644 --- a/testsuite/schedulers/.gitignore +++ b/testsuite/schedulers/.gitignore @@ -7,3 +7,8 @@ unref_src useless_iteration 143777 143777-2 +142183 +142183-2 +147713 +147819 +147894 diff --git a/testsuite/states/Makefile.am b/testsuite/states/Makefile.am index def43ba..0b9ce66 100644 --- a/testsuite/states/Makefile.am +++ b/testsuite/states/Makefile.am @@ -3,8 +3,3 @@ include ../Rules tests_pass = locked parent bin tests_fail = tests_ignore = - - -locked_LDADD = $(GST_OBJ_LIBS) -locked_CFLAGS = $(GST_OBJ_CFLAGS) $(GNOME_CFLAGS) $(XML_CFLAGS) - diff --git a/testsuite/tags/Makefile.am b/testsuite/tags/Makefile.am index 7aa89f3..ecb33ae 100644 --- a/testsuite/tags/Makefile.am +++ b/testsuite/tags/Makefile.am @@ -3,6 +3,3 @@ include ../Rules tests_pass = merge tests_fail = tests_ignore = - -merge_SOURCES = merge.c - diff --git a/testsuite/threads/Makefile.am b/testsuite/threads/Makefile.am index e146c83..1d0c260 100644 --- a/testsuite/threads/Makefile.am +++ b/testsuite/threads/Makefile.am @@ -5,9 +5,6 @@ tests_fail = thread5 threadd threadg tests_ignore = queue threade threadb threadc -queue_SOURCES = queue.c -queue_CFLAGS = $(AM_CFLAGS) - thread1_SOURCES = thread.c thread1_CFLAGS = -DTESTNUM=1 $(AM_CFLAGS) thread2_SOURCES = thread.c -- 2.7.4