mirror of
https://github.com/brl/mutter.git
synced 2024-12-23 19:42:05 +00:00
2008-11-18 Emmanuele Bassi <ebassi@linux.intel.com>
* tests/conform/test-conform-main.c (main): Do not run the conformance test suite if we are on X11 but we do not have a DISPLAY available. Some of the tests require a DISPLAY, and everything passes through a clutter_init() call which will fail anyway. If we are running make distcheck on an headless box we might as well just skip the conformance test suite without a meaningless error.
This commit is contained in:
parent
7a6353b971
commit
ab9464b33d
10
ChangeLog
10
ChangeLog
@ -1,3 +1,13 @@
|
||||
2008-11-18 Emmanuele Bassi <ebassi@linux.intel.com>
|
||||
|
||||
* tests/conform/test-conform-main.c (main): Do not run the
|
||||
conformance test suite if we are on X11 but we do not have
|
||||
a DISPLAY available. Some of the tests require a DISPLAY,
|
||||
and everything passes through a clutter_init() call which will
|
||||
fail anyway. If we are running make distcheck on an headless
|
||||
box we might as well just skip the conformance test suite
|
||||
without a meaningless error.
|
||||
|
||||
2008-11-18 Emmanuele Bassi <ebassi@linux.intel.com>
|
||||
|
||||
* tests/conform/test-mesh-contiguous.c:
|
||||
|
@ -1,3 +1,5 @@
|
||||
#include "config.h"
|
||||
|
||||
#include <clutter/clutter.h>
|
||||
|
||||
#include <glib.h>
|
||||
@ -30,6 +32,18 @@ int
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
TestConformSharedState *shared_state = g_new0 (TestConformSharedState, 1);
|
||||
const gchar *display;
|
||||
|
||||
#ifdef HAVE_CLUTTER_GLX
|
||||
/* on X11 we need a display connection to run the test suite */
|
||||
display = g_getenv ("DISPLAY");
|
||||
if (!display || *display == '\0')
|
||||
{
|
||||
g_print ("No DISPLAY found. Unable to run the conformance "
|
||||
"test suite without a display.");
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
#endif
|
||||
|
||||
g_test_init (&argc, &argv, NULL);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user