lauromoura pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=b6c76c78b8a0704b0dbe6e7c558dcc8787510290
commit b6c76c78b8a0704b0dbe6e7c558dcc8787510290 Author: Cedric BAIL <[email protected]> Date: Wed Oct 2 23:28:38 2019 -0300 elementary: always use a font that matches our expectation for our test instead of the system one. Summary: Our tests do rely on the font to have certain characteristic so that they have the value and the item size being calculated is the one we expect. As it is quite hard to support an infinite number of font with random size, it is easier to embed one we can rely on for our test. I have copied Vera from Expedite and changed evas global font path to look for it first. After this patch, even with an incompatible font in the system, it does still pass all tests. This add around 400KB of data to our git, but is necessary for a reliable tests suite. @fix T8277 Reviewers: lauromoura, zmike, bu5hm4n Reviewed By: zmike Subscribers: #reviewers, #committers Tags: #efl Maniphest Tasks: T8277 Differential Revision: https://phab.enlightenment.org/D10276 --- src/tests/elementary/fonts/Vera.ttf | Bin 0 -> 65932 bytes src/tests/elementary/fonts/VeraBI.ttf | Bin 0 -> 63208 bytes src/tests/elementary/fonts/VeraBd.ttf | Bin 0 -> 58716 bytes src/tests/elementary/fonts/VeraIt.ttf | Bin 0 -> 63684 bytes src/tests/elementary/fonts/VeraSe.ttf | Bin 0 -> 60280 bytes src/tests/elementary/fonts/VeraSeBd.ttf | Bin 0 -> 58736 bytes src/tests/elementary/fonts/fonts.alias | 7 +++++++ src/tests/elementary/fonts/fonts.dir | 31 +++++++++++++++++++++++++++++++ src/tests/elementary/suite_helpers.c | 13 +++++++++++-- 9 files changed, 49 insertions(+), 2 deletions(-) diff --git a/src/tests/elementary/fonts/Vera.ttf b/src/tests/elementary/fonts/Vera.ttf new file mode 100644 index 0000000000..58cd6b5e61 Binary files /dev/null and b/src/tests/elementary/fonts/Vera.ttf differ diff --git a/src/tests/elementary/fonts/VeraBI.ttf b/src/tests/elementary/fonts/VeraBI.ttf new file mode 100644 index 0000000000..b55eee397e Binary files /dev/null and b/src/tests/elementary/fonts/VeraBI.ttf differ diff --git a/src/tests/elementary/fonts/VeraBd.ttf b/src/tests/elementary/fonts/VeraBd.ttf new file mode 100644 index 0000000000..51d6111d72 Binary files /dev/null and b/src/tests/elementary/fonts/VeraBd.ttf differ diff --git a/src/tests/elementary/fonts/VeraIt.ttf b/src/tests/elementary/fonts/VeraIt.ttf new file mode 100644 index 0000000000..cc23c9efd2 Binary files /dev/null and b/src/tests/elementary/fonts/VeraIt.ttf differ diff --git a/src/tests/elementary/fonts/VeraSe.ttf b/src/tests/elementary/fonts/VeraSe.ttf new file mode 100644 index 0000000000..4b4ecc6667 Binary files /dev/null and b/src/tests/elementary/fonts/VeraSe.ttf differ diff --git a/src/tests/elementary/fonts/VeraSeBd.ttf b/src/tests/elementary/fonts/VeraSeBd.ttf new file mode 100644 index 0000000000..672bf761fe Binary files /dev/null and b/src/tests/elementary/fonts/VeraSeBd.ttf differ diff --git a/src/tests/elementary/fonts/fonts.alias b/src/tests/elementary/fonts/fonts.alias new file mode 100644 index 0000000000..c5a31c8fe5 --- /dev/null +++ b/src/tests/elementary/fonts/fonts.alias @@ -0,0 +1,7 @@ +Vera-Bold-Italic -Bitstream-Bitstream Vera Sans-bold-i-normal--0-0-0-0-p-0-ascii-0 +Vera-Normal -Bitstream-Bitstream Vera Sans-medium-r-normal--0-0-0-0-p-0-ascii-0 +Vera-Bold -Bitstream-Bitstream Vera Sans-bold-r-normal--0-0-0-0-p-0-ascii-0 +Vera-Italic -Bitstream-Bitstream Vera Sans-medium-i-normal--0-0-0-0-p-0-ascii-0 +Vera-Serif -Bitstream-Bitstream Vera Serif-medium-r-normal--0-0-0-0-p-0-ascii-0 +Vera-Serif-Bold -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-ascii-0 +Vera -Bitstream-Bitstream Vera Sans-medium-r-normal--0-0-0-0-p-0-ascii-0 diff --git a/src/tests/elementary/fonts/fonts.dir b/src/tests/elementary/fonts/fonts.dir new file mode 100644 index 0000000000..660691d350 --- /dev/null +++ b/src/tests/elementary/fonts/fonts.dir @@ -0,0 +1,31 @@ +30 +VeraBI.ttf -Bitstream-Bitstream Vera Sans-bold-i-normal--0-0-0-0-p-0-ascii-0 +VeraBI.ttf -Bitstream-Bitstream Vera Sans-bold-i-normal--0-0-0-0-p-0-fcd8859-15 +VeraBI.ttf -Bitstream-Bitstream Vera Sans-bold-i-normal--0-0-0-0-p-0-iso8859-1 +VeraBI.ttf -Bitstream-Bitstream Vera Sans-bold-i-normal--0-0-0-0-p-0-iso8859-15 +VeraBI.ttf -Bitstream-Bitstream Vera Sans-bold-i-normal--0-0-0-0-p-0-iso8859-9 +Vera.ttf -Bitstream-Bitstream Vera Sans-medium-r-normal--0-0-0-0-p-0-ascii-0 +Vera.ttf -Bitstream-Bitstream Vera Sans-medium-r-normal--0-0-0-0-p-0-fcd8859-15 +Vera.ttf -Bitstream-Bitstream Vera Sans-medium-r-normal--0-0-0-0-p-0-iso8859-1 +Vera.ttf -Bitstream-Bitstream Vera Sans-medium-r-normal--0-0-0-0-p-0-iso8859-15 +Vera.ttf -Bitstream-Bitstream Vera Sans-medium-r-normal--0-0-0-0-p-0-iso8859-9 +VeraBd.ttf -Bitstream-Bitstream Vera Sans-bold-r-normal--0-0-0-0-p-0-ascii-0 +VeraBd.ttf -Bitstream-Bitstream Vera Sans-bold-r-normal--0-0-0-0-p-0-fcd8859-15 +VeraBd.ttf -Bitstream-Bitstream Vera Sans-bold-r-normal--0-0-0-0-p-0-iso8859-1 +VeraBd.ttf -Bitstream-Bitstream Vera Sans-bold-r-normal--0-0-0-0-p-0-iso8859-15 +VeraBd.ttf -Bitstream-Bitstream Vera Sans-bold-r-normal--0-0-0-0-p-0-iso8859-9 +VeraIt.ttf -Bitstream-Bitstream Vera Sans-medium-i-normal--0-0-0-0-p-0-ascii-0 +VeraIt.ttf -Bitstream-Bitstream Vera Sans-medium-i-normal--0-0-0-0-p-0-fcd8859-15 +VeraIt.ttf -Bitstream-Bitstream Vera Sans-medium-i-normal--0-0-0-0-p-0-iso8859-1 +VeraIt.ttf -Bitstream-Bitstream Vera Sans-medium-i-normal--0-0-0-0-p-0-iso8859-15 +VeraIt.ttf -Bitstream-Bitstream Vera Sans-medium-i-normal--0-0-0-0-p-0-iso8859-9 +VeraSe.ttf -Bitstream-Bitstream Vera Serif-medium-r-normal--0-0-0-0-p-0-ascii-0 +VeraSe.ttf -Bitstream-Bitstream Vera Serif-medium-r-normal--0-0-0-0-p-0-fcd8859-15 +VeraSe.ttf -Bitstream-Bitstream Vera Serif-medium-r-normal--0-0-0-0-p-0-iso8859-1 +VeraSe.ttf -Bitstream-Bitstream Vera Serif-medium-r-normal--0-0-0-0-p-0-iso8859-15 +VeraSe.ttf -Bitstream-Bitstream Vera Serif-medium-r-normal--0-0-0-0-p-0-iso8859-9 +VeraSeBd.ttf -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-ascii-0 +VeraSeBd.ttf -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-fcd8859-15 +VeraSeBd.ttf -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-iso8859-1 +VeraSeBd.ttf -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-iso8859-15 +VeraSeBd.ttf -Bitstream-Bitstream Vera Serif-bold-r-normal--0-0-0-0-p-0-iso8859-9 diff --git a/src/tests/elementary/suite_helpers.c b/src/tests/elementary/suite_helpers.c index d4204ef79e..a109f838db 100644 --- a/src/tests/elementary/suite_helpers.c +++ b/src/tests/elementary/suite_helpers.c @@ -193,7 +193,7 @@ _ui_win_visibility_change(void *data EINA_UNUSED, const Efl_Event *ev) EFL_CLASS_SIMPLE_CLASS(efl_loop, "Efl.Loop", EFL_LOOP_CLASS) static Evas_Object * -_elm_suite_win_create() +_elm_suite_win_create(void) { Evas_Object *win; Eo *loop, *timer; @@ -225,9 +225,18 @@ _elm_suite_win_create() return win; } +#define TEST_FONT_DIR TESTS_SRC_DIR "/fonts/" + Evas_Object * -win_add() +win_add(void) { + static Eina_Bool font_path = EINA_FALSE; + + if (!font_path) + { + evas_font_path_global_append(TEST_FONT_DIR); + font_path = EINA_TRUE; + } if (getpid() != main_pid) { if (global_win) return global_win; --
