Test rework #18: Eolian

diff --git a/src/tests/eolian/eolian_generation.c b/src/tests/eolian/eolian_generation.c
index ac8a16a..9512e33 100644 (file)
--- a/src/tests/eolian/eolian_generation.c
+++ b/src/tests/eolian/eolian_generation.c
@@ -5,14 +5,15 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include<Eina.h>
-#include "Eolian.h"
-#include "eolian_suite.h"
-
 #ifdef HAVE_EVIL
 #include "Evil.h"
 #endif
 
+#include <Eina.h>
+#include <Eolian.h>
+
+#include "eolian_suite.h"
+
 static Eina_Bool
 _files_compare (const char *ref_filename, const char *tmp_filename)
 {
@@ -190,4 +191,3 @@ void eolian_generation_test(TCase *tc)
    tcase_add_test(tc, eolian_import);
    tcase_add_test(tc, eolian_docs);
 }
-

diff --git a/src/tests/eolian/eolian_parsing.c b/src/tests/eolian/eolian_parsing.c
index 5f66e2d..feec478 100644 (file)
--- a/src/tests/eolian/eolian_parsing.c
+++ b/src/tests/eolian/eolian_parsing.c
@@ -5,8 +5,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include<Eina.h>
-#include "Eolian.h"
+#include <Eina.h>
+#include <Eolian.h>
+
 #include "eolian_suite.h"
 
 START_TEST(eolian_namespaces)
@@ -1323,4 +1324,3 @@ void eolian_parsing_test(TCase *tc)
    tcase_add_test(tc, eolian_decl);
    tcase_add_test(tc, eolian_docs);
 }
-

diff --git a/src/tests/eolian/eolian_suite.c b/src/tests/eolian/eolian_suite.c
index ee73549..c640a57 100644 (file)
--- a/src/tests/eolian/eolian_suite.c
+++ b/src/tests/eolian/eolian_suite.c
@@ -2,108 +2,33 @@
 # include <config.h>
 #endif
 
-#include <stdlib.h>
-#include <stdio.h>
+#ifdef _WIN32
+# include <Evil.h> /* setenv */
+#endif
 
-#include<Eina.h>
 #include "eolian_suite.h"
+#include "../efl_check.h"
 
-typedef struct _Eolian_Test_Case Eolian_Test_Case;
-
-struct _Eolian_Test_Case
-{
-   const char *test_case;
-   void      (*build)(TCase *tc);
-};
-
-static const Eolian_Test_Case etc[] = {
+static const Efl_Test_Case etc[] = {
   { "Eolian Parsing", eolian_parsing_test},
   { "Eolian Generation", eolian_generation_test},
   { NULL, NULL }
 };
 
-static void
-_list_tests(void)
-{
-  const Eolian_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 *
-eolian_suite_build(int argc, const char **argv)
-{
-   TCase *tc;
-   Suite *s;
-   int i;
-
-   s = suite_create("Eolian");
-
-   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;
+
    setenv("CK_FORK", "no", 0);
 
-   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 = eolian_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,
+                                           "Eolian", etc);
 
    return (failed_count == 0) ? 0 : 255;
 }