From ea82d2d72a1e7a1b542f3253d76ad2a588a3284c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 25 Jun 2010 18:24:47 +0200 Subject: [PATCH] tests: Remove GstXML tests --- tests/check/Makefile.am | 7 ------- tests/check/gst/struct_hppa.h | 2 +- tests/check/gst/struct_i386.h | 2 +- tests/check/gst/struct_ppc32.h | 2 ++ tests/check/gst/struct_ppc64.h | 2 +- tests/check/gst/struct_sparc.h | 2 ++ tests/check/gst/struct_x86_64.h | 2 +- 7 files changed, 8 insertions(+), 11 deletions(-) diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 36b6105..5c1f35d 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -33,12 +33,6 @@ else PARSE_CHECKS = pipelines/simple-launch-lines pipelines/cleanup pipelines/parse-launch endif -if GST_DISABLE_LOADSAVE -LOADSAVE_CHECKS = -else -LOADSAVE_CHECKS = gst/gstxml -endif - # if it's calling gst_element_factory_make(), it will probably not work without # a registry if GST_DISABLE_REGISTRY @@ -97,7 +91,6 @@ check_PROGRAMS = \ gst/gsttagsetter \ gst/gsttask \ gst/gstvalue \ - $(LOADSAVE_CHECKS) \ generic/states \ $(PARSE_CHECKS) \ $(REGISTRY_CHECKS) \ diff --git a/tests/check/gst/struct_hppa.h b/tests/check/gst/struct_hppa.h index 5d2b9db..a458c52 100644 --- a/tests/check/gst/struct_hppa.h +++ b/tests/check/gst/struct_hppa.h @@ -67,7 +67,7 @@ static GstCheckABIStruct list[] = { {"GstTypeFindFactoryClass", sizeof (GstTypeFindFactoryClass), 152}, {"GstURIHandlerInterface", sizeof (GstURIHandlerInterface), 44}, {"GstValueTable", sizeof (GstValueTable), 32}, -#ifndef GST_DISABLE_LOADSAVE +#if !defined(GST_DISABLE_LOADSAVE) && !defined(GST_DISABLE_DEPRECATED) && !defined(GST_REMOVE_DEPRECATED) {"GstXML", sizeof (GstXML), 64}, {"GstXMLClass", sizeof (GstXMLClass), 144}, #endif diff --git a/tests/check/gst/struct_i386.h b/tests/check/gst/struct_i386.h index 1fe5c64..de68f1e 100644 --- a/tests/check/gst/struct_i386.h +++ b/tests/check/gst/struct_i386.h @@ -67,7 +67,7 @@ static GstCheckABIStruct list[] = { {"GstTypeFindFactoryClass", sizeof(GstTypeFindFactoryClass), 152}, {"GstURIHandlerInterface", sizeof(GstURIHandlerInterface), 44}, {"GstValueTable", sizeof(GstValueTable), 32}, -#ifndef GST_DISABLE_LOADSAVE +#if !defined(GST_DISABLE_LOADSAVE) && !defined(GST_DISABLE_DEPRECATED) && !defined(GST_REMOVE_DEPRECATED) {"GstXML", sizeof(GstXML), 64}, {"GstXMLClass", sizeof(GstXMLClass), 144}, #endif diff --git a/tests/check/gst/struct_ppc32.h b/tests/check/gst/struct_ppc32.h index 4b943f4..a458c52 100644 --- a/tests/check/gst/struct_ppc32.h +++ b/tests/check/gst/struct_ppc32.h @@ -67,7 +67,9 @@ static GstCheckABIStruct list[] = { {"GstTypeFindFactoryClass", sizeof (GstTypeFindFactoryClass), 152}, {"GstURIHandlerInterface", sizeof (GstURIHandlerInterface), 44}, {"GstValueTable", sizeof (GstValueTable), 32}, +#if !defined(GST_DISABLE_LOADSAVE) && !defined(GST_DISABLE_DEPRECATED) && !defined(GST_REMOVE_DEPRECATED) {"GstXML", sizeof (GstXML), 64}, {"GstXMLClass", sizeof (GstXMLClass), 144}, +#endif {NULL, 0, 0} }; diff --git a/tests/check/gst/struct_ppc64.h b/tests/check/gst/struct_ppc64.h index 02de86d..b3e2a92 100644 --- a/tests/check/gst/struct_ppc64.h +++ b/tests/check/gst/struct_ppc64.h @@ -67,7 +67,7 @@ static GstCheckABIStruct list[] = { {"GstTypeFindFactoryClass", sizeof (GstTypeFindFactoryClass), 304} , {"GstURIHandlerInterface", sizeof (GstURIHandlerInterface), 88} , {"GstValueTable", sizeof (GstValueTable), 64} , -#ifndef GST_DISABLE_LOADSAVE +#if !defined(GST_DISABLE_LOADSAVE) && !defined(GST_DISABLE_DEPRECATED) && !defined(GST_REMOVE_DEPRECATED) {"GstXML", sizeof (GstXML), 128} , {"GstXMLClass", sizeof (GstXMLClass), 288} , #endif diff --git a/tests/check/gst/struct_sparc.h b/tests/check/gst/struct_sparc.h index 7881c78..34feebe 100644 --- a/tests/check/gst/struct_sparc.h +++ b/tests/check/gst/struct_sparc.h @@ -68,7 +68,9 @@ GstCheckABIStruct list[] = { {"GstTypeFindFactoryClass", sizeof (GstTypeFindFactoryClass), 152}, {"GstURIHandlerInterface", sizeof (GstURIHandlerInterface), 44}, {"GstValueTable", sizeof (GstValueTable), 32}, +#if !defined(GST_DISABLE_LOADSAVE) && !defined(GST_DISABLE_DEPRECATED) && !defined(GST_REMOVE_DEPRECATED) {"GstXML", sizeof (GstXML), 64}, {"GstXMLClass", sizeof (GstXMLClass), 144}, +#endif {NULL, 0, 0} }; diff --git a/tests/check/gst/struct_x86_64.h b/tests/check/gst/struct_x86_64.h index 02de86d..b3e2a92 100644 --- a/tests/check/gst/struct_x86_64.h +++ b/tests/check/gst/struct_x86_64.h @@ -67,7 +67,7 @@ static GstCheckABIStruct list[] = { {"GstTypeFindFactoryClass", sizeof (GstTypeFindFactoryClass), 304} , {"GstURIHandlerInterface", sizeof (GstURIHandlerInterface), 88} , {"GstValueTable", sizeof (GstValueTable), 64} , -#ifndef GST_DISABLE_LOADSAVE +#if !defined(GST_DISABLE_LOADSAVE) && !defined(GST_DISABLE_DEPRECATED) && !defined(GST_REMOVE_DEPRECATED) {"GstXML", sizeof (GstXML), 128} , {"GstXMLClass", sizeof (GstXMLClass), 288} , #endif -- 2.7.4