diff options
| author | Cedric BAIL <cedric.bail@free.fr> | 2019-01-29 09:26:51 -0500 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@samsung.com> | 2019-01-29 09:26:51 -0500 |
| commit | 97e210d727e55fd3290cb16f5e9defea0f6ee70e (patch) | |
| tree | 0d06cb4a79eb36a245bd982d6291f85cd9e01a4e | |
| parent | 7f2b26861f1454925a284724ea981709e755ede7 (diff) | |
| download | efl-97e210d727e55fd3290cb16f5e9defea0f6ee70e.tar.gz | |
elementary: enable efl_ui_suite tests for meson build.
Summary: Depends on D7661
Reviewers: SanghyeonLee, felipealmeida, segfaultxavi, zmike
Reviewed By: SanghyeonLee, zmike
Subscribers: #reviewers, #committers
Tags: #efl
Maniphest Tasks: T7382
Differential Revision: https://phab.enlightenment.org/D7662
| -rw-r--r-- | src/tests/elementary/efl_ui_suite.c | 2 | ||||
| -rw-r--r-- | src/tests/elementary/meson.build | 19 |
2 files changed, 20 insertions, 1 deletions
diff --git a/src/tests/elementary/efl_ui_suite.c b/src/tests/elementary/efl_ui_suite.c index 0ba2542c73..c5c39bd143 100644 --- a/src/tests/elementary/efl_ui_suite.c +++ b/src/tests/elementary/efl_ui_suite.c @@ -12,7 +12,6 @@ efl_main(void *data EINA_UNUSED, { Efl_Loop_Arguments *arge = ev->info; - fail_if(!arge->initialization); fprintf(stderr, "ARGC %d\n", eina_array_count(arge->argv)); fail_if(eina_array_count(arge->argv) != 2); @@ -37,6 +36,7 @@ EFL_START_TEST(efl_ui_test_init) __EFL_MAIN_CONSTRUCTOR; ret__ = efl_loop_begin(efl_app_main_get(EFL_APP_CLASS)); real__ = efl_loop_exit_code_process(ret__); + fail_if(real__ != 0); __EFL_MAIN_DESTRUCTOR; ecore_shutdown_ex(); ecore_shutdown(); diff --git a/src/tests/elementary/meson.build b/src/tests/elementary/meson.build index 823e93e1cf..b8c030b128 100644 --- a/src/tests/elementary/meson.build +++ b/src/tests/elementary/meson.build @@ -116,10 +116,29 @@ elementary_suite = executable('elementary_suite', ] ) +efl_ui_suite_src = [ + 'efl_ui_suite.c', +] + +efl_ui_suite = executable('efl_ui_suite', + efl_ui_suite_src, priv_eo_file_target, + dependencies: [check, eina, elementary, elementary_deps], + include_directories : [config_dir] + [elementary_config_dir], + c_args : [ + '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"', + '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"', + '-DELM_IMAGE_DATA_DIR="'+join_paths(meson.source_root(), 'data', 'elementary')+'"', + '-DELM_TEST_DATA_DIR="'+join_paths(meson.build_root(), 'data', 'elementary')+'"', + ] +) + test('elementary-suite', elementary_suite, env : test_env ) +test('efl-ui-suite', efl_ui_suite, + env : test_env +) install_data(files(['testdiff.diff', 'testfile-windows.txt', 'testfile-withblanks.txt', 'testfile.txt']), install_dir : join_paths(dir_data, 'elementary') |