isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-05-05 22:54:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Try to drop including config.h

Browse Source 
The config.h header should be considered a Clutter internal header, and
the test cases (especially the interactive test cases) should strive to
never rely on internal headers.
This commit is contained in:
Emmanuele Bassi 2011-01-19 14:36:30 +00:00
parent 94b905b9e1
commit a43c5f10bb
11 changed files with 26 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/interactive/test-cogl-offscreen.c
View File

@ -1,4 +1,3 @@
#include <config.h>
#include <glib.h> #include <glib.h>
#include <gmodule.h> #include <gmodule.h>
#include <stdlib.h> #include <stdlib.h>

6
tests/interactive/test-cogl-primitives.c
View File

@ -1,10 +1,10 @@
#include <config.h>
#undef COGL_ENABLE_EXPERIMENTAL_2_0_API
#include <glib.h> #include <glib.h>
#include <gmodule.h> #include <gmodule.h>
#include <stdlib.h> #include <stdlib.h>
#include <clutter/clutter.h>
#undef COGL_ENABLE_EXPERIMENTAL_2_0_API
#include <cogl/cogl.h> #include <cogl/cogl.h>
#include <clutter/clutter.h>
typedef void (*PaintFunc) (void); typedef void (*PaintFunc) (void);

1
tests/interactive/test-cogl-tex-convert.c
View File

@ -1,4 +1,3 @@
#include <config.h>
#include <glib.h> #include <glib.h>
#include <gmodule.h> #include <gmodule.h>
#include <stdlib.h> #include <stdlib.h>

1
tests/interactive/test-cogl-tex-foreign.c
View File

@ -1,4 +1,3 @@
#include <config.h>
#include <glib.h> #include <glib.h>
#include <gmodule.h> #include <gmodule.h>
#include <stdlib.h> #include <stdlib.h>

1
tests/interactive/test-cogl-tex-getset.c
View File

@ -1,4 +1,3 @@
#include <config.h>
#include <glib.h> #include <glib.h>
#include <gmodule.h> #include <gmodule.h>
#include <stdlib.h> #include <stdlib.h>

1
tests/interactive/test-cogl-tex-polygon.c
View File

@ -1,4 +1,3 @@
#include <config.h>
#include <glib.h> #include <glib.h>
#include <gmodule.h> #include <gmodule.h>
#include <stdlib.h> #include <stdlib.h>

1
tests/interactive/test-cogl-tex-tile.c
View File

@ -1,4 +1,3 @@
#include <config.h>
#include <glib.h> #include <glib.h>
#include <gmodule.h> #include <gmodule.h>
#include <stdlib.h> #include <stdlib.h>

1
tests/interactive/test-cogl-vertex-buffer.c
View File

@ -1,4 +1,3 @@
#include <config.h>
#include <glib.h> #include <glib.h>
#include <gmodule.h> #include <gmodule.h>
#include <stdlib.h> #include <stdlib.h>

8
tests/interactive/test-paint-wrapper.c
View File

@ -1,7 +1,3 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <gmodule.h> #include <gmodule.h>
#undef CLUTTER_DISABLE_DEPRECATED #undef CLUTTER_DISABLE_DEPRECATED
@ -16,7 +12,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <glib.h> #include <glib.h>
#ifdef HAVE_CLUTTER_GLX #ifdef CLUTTER_WINDOWING_X11
#include "clutter/x11/clutter-x11.h" #include "clutter/x11/clutter-x11.h"
#endif #endif
@ -205,7 +201,7 @@ test_paint_wrapper_main (int argc, char *argv[])
error = NULL; error = NULL;
#ifdef HAVE_CLUTTER_GLX #ifdef CLUTTER_WINDOWING_X11
clutter_x11_set_use_argb_visual (TRUE); clutter_x11_set_use_argb_visual (TRUE);
#endif #endif

34
tests/interactive/test-pixmap.c
View File

@ -1,4 +1,6 @@
#include <config.h> #ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -7,16 +9,16 @@
#undef CLUTTER_DISABLE_DEPRECATED #undef CLUTTER_DISABLE_DEPRECATED
#include <clutter/clutter.h> #include <clutter/clutter.h>
#if HAVE_CLUTTER_GLX #ifdef CLUTTER_WINDOWING_X11
#include <clutter/x11/clutter-x11.h> # include <clutter/x11/clutter-x11.h>
#include <clutter/x11/clutter-x11-texture-pixmap.h> # include <clutter/x11/clutter-x11-texture-pixmap.h>
#include <clutter/glx/clutter-glx.h> # include <clutter/glx/clutter-glx.h>
#include <clutter/glx/clutter-glx-texture-pixmap.h> # include <clutter/glx/clutter-glx-texture-pixmap.h>
#include <X11/Xlib.h> # include <X11/Xlib.h>
#include <X11/extensions/Xcomposite.h> # include <X11/extensions/Xcomposite.h>
#define IMAGE TESTS_DATADIR G_DIR_SEPARATOR_S "redhand.png" #define IMAGE TESTS_DATADIR G_DIR_SEPARATOR_S "redhand.png"
@ -320,7 +322,7 @@ test_pixmap_main (int argc, char **argv)
clutter_behaviour_apply (depth_behavior, group); clutter_behaviour_apply (depth_behavior, group);
} }
#ifdef HAVE_CLUTTER_GLX #ifdef CLUTTER_WINDOWING_GLX
/* a window with glx */ /* a window with glx */
if (!disable_glx) if (!disable_glx)
{ {
@ -347,7 +349,7 @@ test_pixmap_main (int argc, char **argv)
CLUTTER_GLX_TEXTURE_PIXMAP (tex))) CLUTTER_GLX_TEXTURE_PIXMAP (tex)))
g_print ("NOTE: Using fallback path, not GLX TFP!\n"); g_print ("NOTE: Using fallback path, not GLX TFP!\n");
} }
#endif /* HAVE_CLUTTER_GLX */ #endif /* CLUTTER_WINDOWING_GLX */
if (group) if (group)
row_height = clutter_actor_get_height (group); row_height = clutter_actor_get_height (group);
@ -400,6 +402,12 @@ test_pixmap_main (int argc, char **argv)
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
#else /* HAVE_CLUTTER_GLX */ #else
int test_pixmap_main (int argc, char **argv) { return EXIT_SUCCESS; };
#endif /* HAVE_CLUTTER_GLX */ int
test_pixmap_main (int argc, char **argv)
{
return EXIT_SUCCESS;
};
#endif /* CLUTTER_WINDOWING_X11 */

4
tests/interactive/test-textures.c
View File

@ -1,7 +1,3 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdlib.h> #include <stdlib.h>
#include <gmodule.h> #include <gmodule.h>