brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conform: Drop the TODO macro from the harness

Browse Source 
The TODO macro is barely used, and it's implemented in terms of
deprecated, not portable API. Let's drop it.
This commit is contained in:
Emmanuele Bassi 2013-07-02 22:33:58 +01:00
parent 4a05ac34fc
commit 1124fa9a10
1 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tests/conform/test-conform-main.c
View File

@ -15,23 +15,6 @@ test_conform_skip_test (TestConformSimpleFixture *fixture,
/* void */ /* void */
} }
static void
test_conform_todo_test (TestConformSimpleFixture *fixture,
gconstpointer data)
{
#ifdef G_OS_UNIX
const TestConformTodo *todo = data;
if (g_test_trap_fork (0, G_TEST_TRAP_SILENCE_STDOUT | G_TEST_TRAP_SILENCE_STDERR))
{
todo->func (fixture, NULL);
exit (0);
}
g_test_trap_assert_failed ();
#endif
}
void void
verify_failure (TestConformSimpleFixture *fixture, verify_failure (TestConformSimpleFixture *fixture,
gconstpointer data) gconstpointer data)
@ -76,18 +59,6 @@ static TestConformSharedState *shared_state = NULL;
test_conform_simple_fixture_teardown); \ test_conform_simple_fixture_teardown); \
} } G_STMT_END } } G_STMT_END
#define TEST_CONFORM_TODO(NAMESPACE, FUNC) G_STMT_START { \
extern void FUNC (TestConformSimpleFixture *, gconstpointer); \
TestConformTodo *_clos = g_new0 (TestConformTodo, 1); \
_clos->name = g_strdup ( #FUNC ); \
_clos->func = FUNC; \
g_test_add ("/todo" NAMESPACE "/" #FUNC, \
TestConformSimpleFixture, \
_clos, \
test_conform_simple_fixture_setup, \
test_conform_todo_test, \
test_conform_simple_fixture_teardown); } G_STMT_END
gchar * gchar *
clutter_test_get_data_file (const gchar *filename) clutter_test_get_data_file (const gchar *filename)
{ {
@ -123,12 +94,9 @@ main (int argc, char **argv)
/* This file is run through a sed script during the make step so the /* This file is run through a sed script during the make step so the
lines containing the tests need to be formatted on a single line lines containing the tests need to be formatted on a single line
each. To comment out a test use the SKIP or TODO macros. Using each. To comment out a test use the SKIP macro. Using
#if 0 would break the script. */ #if 0 would break the script. */
/* sanity check for the test suite itself */
TEST_CONFORM_TODO ("/suite", verify_failure);
TEST_CONFORM_SIMPLE ("/actor", actor_add_child); TEST_CONFORM_SIMPLE ("/actor", actor_add_child);
TEST_CONFORM_SIMPLE ("/actor", actor_insert_child); TEST_CONFORM_SIMPLE ("/actor", actor_insert_child);
TEST_CONFORM_SIMPLE ("/actor", actor_raise_child); TEST_CONFORM_SIMPLE ("/actor", actor_raise_child);
@ -244,10 +212,10 @@ main (int argc, char **argv)
TEST_CONFORM_SIMPLE ("/events", events_touch); TEST_CONFORM_SIMPLE ("/events", events_touch);
#if 0
/* FIXME - see bug https://bugzilla.gnome.org/show_bug.cgi?id=655588 */ /* FIXME - see bug https://bugzilla.gnome.org/show_bug.cgi?id=655588 */
TEST_CONFORM_TODO ("/cally", cally_text); TEST_CONFORM_TODO ("/cally", cally_text);
#if 0
TEST_CONFORM_SIMPLE ("/cogl", test_cogl_object); TEST_CONFORM_SIMPLE ("/cogl", test_cogl_object);
TEST_CONFORM_SIMPLE ("/cogl", test_cogl_fixed); TEST_CONFORM_SIMPLE ("/cogl", test_cogl_fixed);
TEST_CONFORM_SIMPLE ("/cogl", test_cogl_materials); TEST_CONFORM_SIMPLE ("/cogl", test_cogl_materials);