diff options
author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2019-11-07 10:23:58 +0000 |
---|---|---|
committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2019-11-07 10:23:58 +0000 |
commit | 39240fa3e723c8b0f2dc1792cc5b938502297655 (patch) | |
tree | ecdcbf997154f0981ca4e97eff91653800bcf4fd /src/tests/evas/evas_test_textblock.c | |
parent | e4e7ff3905090a75eb900672be7208f1f62fcf65 (diff) | |
download | efl-39240fa3e723c8b0f2dc1792cc5b938502297655.tar.gz |
Revert "evas_textblock: content fit feature"
This reverts commit 2f676a6591c117e15d65f263ebd267866963b627.
This causes segv's in edje_cc - i suspect the eet changes (or in combo
to how they are used in edje):
AddressSanitizer:DEADLYSIGNAL
=================================================================
==8991==ERROR: AddressSanitizer: SEGV on unknown address 0x000001010000 (pc 0xffff9f002604 bp 0xfffffa747700 sp 0xfffffa747700 T0)
==8991==The signal is caused by a READ memory access.
#0 0xffff9f002600 in _eet_hash_gen ../src/lib/eet/eet_utils.c:25
#1 0xffff9efdd024 in eet_dictionary_string_add ../src/lib/eet/eet_dictionary.c:103
#2 0xffff9efbe324 in eet_data_put_string ../src/lib/eet/eet_data.c:849
#3 0xffff9efc1c4c in eet_data_put_type ../src/lib/eet/eet_data.c:1427
#4 0xffff9efd9128 in eet_data_put_unknown ../src/lib/eet/eet_data.c:4730
#5 0xffff9efdb320 in _eet_data_descriptor_encode ../src/lib/eet/eet_data.c:5108
#6 0xffff9efd5958 in eet_data_put_variant ../src/lib/eet/eet_data.c:4309
#7 0xffff9efdb320 in _eet_data_descriptor_encode ../src/lib/eet/eet_data.c:5108
#8 0xffff9efd9270 in eet_data_put_unknown ../src/lib/eet/eet_data.c:4739
#9 0xffff9efdb320 in _eet_data_descriptor_encode ../src/lib/eet/eet_data.c:5108
#10 0xffff9efd8ca0 in eet_data_put_array ../src/lib/eet/eet_data.c:4692
#11 0xffff9efdb320 in _eet_data_descriptor_encode ../src/lib/eet/eet_data.c:5108
#12 0xffff9efc7768 in eet_data_write_cipher ../src/lib/eet/eet_data.c:2403
#13 0xffff9efc78a4 in eet_data_write ../src/lib/eet/eet_data.c:2420
#14 0xaaaabb151dcc in data_thread_group ../src/bin/edje/edje_cc_out.c:2045
#15 0xaaaabb152130 in data_write_groups ../src/bin/edje/edje_cc_out.c:2086
#16 0xaaaabb157734 in data_write ../src/bin/edje/edje_cc_out.c:2866
#17 0xaaaabb14122c in main ../src/bin/edje/edje_cc.c:456
#18 0xffff9dbd92a0 in __libc_start_main (/usr/lib/aarch64-linux-gnu/libc.so.6+0x242a0)
#19 0xaaaabb13ea00 (/home/raster/C/git/efl/build/src/bin/edje/edje_cc+0x38a00)
AddressSanitizer can not provide additional info.
SUMMARY: AddressSanitizer: SEGV ../src/lib/eet/eet_utils.c:25 in _eet_hash_gen
==8991==ABORTING
Aborted (core dumped)
When compiling breaks... it's certainly time to revert ASAP :(
Diffstat (limited to 'src/tests/evas/evas_test_textblock.c')
-rw-r--r-- | src/tests/evas/evas_test_textblock.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/src/tests/evas/evas_test_textblock.c b/src/tests/evas/evas_test_textblock.c index 03ae5992a4..f61574c065 100644 --- a/src/tests/evas/evas_test_textblock.c +++ b/src/tests/evas/evas_test_textblock.c @@ -4129,32 +4129,6 @@ EFL_START_TEST(evas_textblock_obstacle) } EFL_END_TEST; -EFL_START_TEST(evas_textblock_fit) -{ - START_TB_TEST(); - Evas_Coord fw, fh,fw_new, fh_new; - int n_ret; - const char *buf = - "This is an example text to demonstrate the textblock object" - " with content fit feature."; - evas_object_textblock_text_markup_set(tb, buf); - evas_object_resize(tb, 300, 300); - evas_object_textblock_size_formatted_get(tb, &fw, &fh); - n_ret = evas_textblock_fit_options_set(tb,TEXTBLOCK_FIT_MODE_ALL); - fail_if(n_ret != EVAS_ERROR_SUCCESS); - n_ret = evas_textblock_fit_size_range_set(tb,1,50); - fail_if(n_ret != EVAS_ERROR_SUCCESS); - evas_object_textblock_size_formatted_get(tb, &fw_new, &fh_new); - fail_if(fw_new == fw && fh_new == fh); - unsigned int size_array[3] = {150,200,250}; - n_ret = evas_textblock_fit_size_array_set(tb,size_array,3); - fail_if(n_ret != EVAS_ERROR_SUCCESS); - evas_object_textblock_size_formatted_get(tb, &fw, &fh); - fail_if(fw_new == fw && fh_new == fh); - END_TB_TEST(); -} -EFL_END_TEST; - #ifdef HAVE_HYPHEN static void _hyphenation_width_stress(Evas_Object *tb, Evas_Textblock_Cursor *cur) @@ -4755,7 +4729,6 @@ void evas_test_textblock(TCase *tc) tcase_add_test(tc, evas_textblock_items); tcase_add_test(tc, evas_textblock_delete); tcase_add_test(tc, evas_textblock_obstacle); - tcase_add_test(tc, evas_textblock_fit); #ifdef HAVE_HYPHEN tcase_add_test(tc, evas_textblock_hyphenation); #endif |