2 files changed, 8 insertions, 88 deletions

diff --git a/src/tests/edje/edje_suite.c b/src/tests/edje/edje_suite.c
index 9284dbf319..416a0ec3f8 100644
--- a/src/tests/edje/edje_suite.c
+++ b/src/tests/edje/edje_suite.c
@@ -2,106 +2,26 @@
 # include <config.h>
 #endif
 
-#include <stdlib.h>
-#include <stdio.h>
-
-#include <Edje.h>
-
 #include "edje_suite.h"
+#include "../efl_check.h"
 
-typedef struct _Edje_Test_Case Edje_Test_Case;
-
-struct _Edje_Test_Case
-{
-   const char *test_case;
-   void      (*build)(TCase *tc);
-};
-
-static const Edje_Test_Case etc[] = {
+static const Efl_Test_Case etc[] = {
   { "Edje", edje_test_edje },
   { NULL, NULL }
 };
 
-static void
-_list_tests(void)
-{
-  const Edje_Test_Case *itr;
-
-   itr = etc;
-   fputs("Available Test Cases:\n", stderr);
-   for (; itr->test_case; itr++)
-     fprintf(stderr, "\t%s\n", itr->test_case);
-}
-static Eina_Bool
-_use_test(int argc, const char **argv, const char *test_case)
-{
-   if (argc < 1)
-     return 1;
-
-   for (; argc > 0; argc--, argv++)
-     if (strcmp(test_case, *argv) == 0)
-       return 1;
-   return 0;
-}
-
-static Suite *
-edje_suite_build(int argc, const char **argv)
-{
-   TCase *tc;
-   Suite *s;
-   int i;
-
-   s = suite_create("Edje");
-
-   for (i = 0; etc[i].test_case; ++i)
-     {
-        if (!_use_test(argc, argv, etc[i].test_case)) continue;
-        tc = tcase_create(etc[i].test_case);
-
-        etc[i].build(tc);
-
-        suite_add_tcase(s, tc);
-#ifndef _WIN32
-        tcase_set_timeout(tc, 0);
-#endif
-     }
-
-   return s;
-}
-
 int
 main(int argc, char **argv)
 {
-   Suite *s;
-   SRunner *sr;
-   int i, failed_count;
+   int failed_count;
 
-   for (i = 1; i < argc; i++)
-     if ((strcmp(argv[i], "-h") == 0) ||
-         (strcmp(argv[i], "--help") == 0))
-       {
-          fprintf(stderr, "Usage:\n\t%s [test_case1 .. [test_caseN]]\n",
-                  argv[0]);
-          _list_tests();
-          return 0;
-       }
-     else if ((strcmp(argv[i], "-l") == 0) ||
-              (strcmp(argv[i], "--list") == 0))
-       {
-          _list_tests();
-          return 0;
-       }
+   if (!_efl_test_option_disp(argc, argv, etc))
+     return 0;
 
    putenv("EFL_RUN_IN_TREE=1");
 
-   s = edje_suite_build(argc - 1, (const char **)argv + 1);
-   sr = srunner_create(s);
-
-   srunner_set_xml(sr, TESTS_BUILD_DIR "/check-results.xml");
-
-   srunner_run_all(sr, CK_ENV);
-   failed_count = srunner_ntests_failed(sr);
-   srunner_free(sr);
+   failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
+                                           "Edje", etc);
 
    return (failed_count == 0) ? 0 : 255;
 }
diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c
index 407ff9af30..8d5f725e64 100644
--- a/src/tests/edje/edje_test_edje.c
+++ b/src/tests/edje/edje_test_edje.c
@@ -363,7 +363,7 @@ START_TEST(edje_test_color_class)
 END_TEST
 
 void edje_test_edje(TCase *tc)
-{    
+{
    tcase_add_test(tc, edje_test_edje_init);
    tcase_add_test(tc,edje_test_load_simple_layout);
    tcase_add_test(tc, edje_test_edje_load);