Disable deprecation warnings for the test suite

We test deprecated functionality as well as current one, so we need to enable all symbols and disable the deprecation warnings.
2011-10-13 17:50:25 +01:00 · 2011-10-13 17:50:25 +01:00 · 96cb1d7128
commit 96cb1d7128
parent a063f09611
7 changed files with 4 additions and 17 deletions
--- a/tests/conform/Makefile.am
+++ b/tests/conform/Makefile.am
@ -159,8 +159,8 @@ INCLUDES = \
 test_conformance_CPPFLAGS = \
 	-DG_DISABLE_SINGLE_INCLUDES \
 	-DCOGL_ENABLE_EXPERIMENTAL_API \
-	-DCOGL_DISABLE_DEPRECATED \
-	-DCLUTTER_DISABLE_DEPRECATED \
+	-DG_DISABLE_DEPRECATION_WARNINGS \
+	-DCLUTTER_DISABLE_DEPRECATION_WARNINGS \
 	-DTESTS_DATADIR=\""$(top_srcdir)/tests/data"\"

 test_conformance_CFLAGS = -g $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
--- a/tests/conform/test-clutter-cairo-texture.c
+++ b/tests/conform/test-clutter-cairo-texture.c
@ -1,5 +1,3 @@
-#undef CLUTTER_DISABLE_DEPRECATED
-#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include <clutter/clutter.h>
 #include <cogl/cogl.h>

--- a/tests/conform/test-texture-fbo.c
+++ b/tests/conform/test-texture-fbo.c
@ -1,5 +1,3 @@
-#undef CLUTTER_DISABLE_DEPRECATED
-#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include <clutter/clutter.h>
 #include <cogl/cogl.h>

--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@ -137,8 +137,8 @@ test_interactive_CFLAGS = $(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)
 test_interactive_CPPFLAGS = \
 	-DTESTS_DATADIR=\""$(abs_top_srcdir)/tests/data"\" \
 	-DG_DISABLE_SINGLE_INCLUDES \
-	-DCOGL_DISABLE_DEPRECATED \
-	-DCLUTTER_DISABLE_DEPRECATED
+	-DGLIB_DISABLE_DEPRECATION_WARNINGS \
+	-DCLUTTER_DISABLE_DEPRECATION_WARNINGS
 test_interactive_LDFLAGS = -export-dynamic
 test_interactive_LDADD = $(CLUTTER_LIBS) $(common_ldadd) -lm

--- a/tests/interactive/test-cairo-flowers.c
+++ b/tests/interactive/test-cairo-flowers.c
@ -1,9 +1,6 @@
 /*
 * Pretty cairo flower hack.
 */
-
-#undef CLUTTER_DISABLE_DEPRECATED
-#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include <clutter/clutter.h>

 #ifndef _MSC_VER
--- a/tests/interactive/test-fbo.c
+++ b/tests/interactive/test-fbo.c
@ -1,5 +1,3 @@
-#undef CLUTTER_DISABLE_DEPRECATED
-#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include <clutter/clutter.h>

 #include <errno.h>
--- a/tests/interactive/test-shader.c
+++ b/tests/interactive/test-shader.c
@ -1,7 +1,3 @@
-/*#define TEST_GROUP */
-
-#undef CLUTTER_DISABLE_DEPRECATED
-#define CLUTTER_DISABLE_DEPRECATION_WARNINGS
 #include <clutter/clutter.h>

 #include <errno.h>