From f84408e3253e2573d71bbf0939e6ecc1e44f6e3a Mon Sep 17 00:00:00 2001 From: Shinwoo Kim Date: Tue, 4 Sep 2018 14:58:10 +0900 Subject: [PATCH] tests: fix a build error on the 0.12.0 check Summary: (1) EFL_START_TEST(TEST_NAME) is defined as follows if you are using the 0.12.0 check: START_TEST(TEST_NAME) \ _timing_start(); (2) START_TEST(__testname) is defined as follows (To make it simple I am using 'blah-blah' here): static void __testname_fn (blah-blah);\ static const TTest __testname_ttest = { blah-blah };\ static const TTest * __testname = & __testname_ttest;\ static void __testname_fn (blah-blah) For example we are using as follows in a test case: EFL_START_TEST(evas_object_smart_paragraph_direction) { ... } EFL_END_TEST This made a build error. Test Plan: make check Reviewers: Hermet, zmike Reviewed By: Hermet Subscribers: cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D6969 --- src/tests/efl_check.h | 2 ++ src/tests/eio/eio_suite.c | 2 ++ src/tests/elementary/elm_code_test_indent.c | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/tests/efl_check.h b/src/tests/efl_check.h index d1a064943b..29c9aeeb01 100644 --- a/src/tests/efl_check.h +++ b/src/tests/efl_check.h @@ -207,10 +207,12 @@ _timing_end(void) # define EFL_START_TEST(TEST_NAME) \ START_TEST(TEST_NAME) \ + { \ _timing_start(); # define EFL_END_TEST \ _timing_end(); \ + } \ END_TEST #else diff --git a/src/tests/eio/eio_suite.c b/src/tests/eio/eio_suite.c index 9998e1fac4..45ea556639 100644 --- a/src/tests/eio/eio_suite.c +++ b/src/tests/eio/eio_suite.c @@ -10,6 +10,8 @@ #include EFL_START_TEST(eio_init_test) +{ +} EFL_END_TEST static void diff --git a/src/tests/elementary/elm_code_test_indent.c b/src/tests/elementary/elm_code_test_indent.c index 6b564420f0..b27f1a0834 100644 --- a/src/tests/elementary/elm_code_test_indent.c +++ b/src/tests/elementary/elm_code_test_indent.c @@ -184,7 +184,7 @@ EFL_START_TEST (elm_code_indent_tab_matching_braces) elm_code_free(code); elm_shutdown(); } -END_TEST +EFL_END_TEST EFL_START_TEST (elm_code_indent_startswith_keyword) {