[clutter/clutter-1.16] conform: Move timeline-base under conditional check

[Emmanuele Bassi <ebassi src gnome org>]

commit 4787ae2f638bc35c48caec2515427cf85aed25e2
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Tue Jul 2 22:04:37 2013 +0100

    conform: Move timeline-base under conditional check
    
    The timeline base test unit is pretty slow, and under heavy load it will
    tend to fail because of skipped frames. We should put it under
    conditional testing and only run it if `-m slow` is passed to the test
    harness.

 tests/conform/test-conform-main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/tests/conform/test-conform-main.c b/tests/conform/test-conform-main.c
index 387c28a..8cd5a34 100644
--- a/tests/conform/test-conform-main.c
+++ b/tests/conform/test-conform-main.c
@@ -231,7 +231,7 @@ main (int argc, char **argv)
   TEST_CONFORM_SIMPLE ("/script", state_base);
   TEST_CONFORM_SIMPLE ("/script", script_margin);
 
-  TEST_CONFORM_SIMPLE ("/timeline", timeline_base);
+  TEST_CONFORM_SKIP (g_test_slow (), "/timeline", timeline_base);
   TEST_CONFORM_SIMPLE ("/timeline", timeline_markers_from_script);
   TEST_CONFORM_SKIP (g_test_slow (), "/timeline", timeline_interpolation);
   TEST_CONFORM_SKIP (g_test_slow (), "/timeline", timeline_rewind);