1
0
Fork 0

[A] Added tests to freebsd

This commit is contained in:
seleznevae 2019-01-12 16:26:59 +03:00
parent 0510aca314
commit 96efea9c0e
3 changed files with 15 additions and 6 deletions

View File

@ -3,7 +3,7 @@ freebsd_instance:
main_task:
script:
- echo "Hello cirrus"
- uname -a
- ls
- yes | pkg install cmake
- cc --version
@ -21,4 +21,15 @@ main_task:
- c++ -Wall -Wextra -Werror -DFT_CONGIG_HAVE_WCHAR fort.cpp -c -o fort.o
- rm fort.o
- rm fort.cpp
- cd ..
- cd ..
# Perform out-of-source build(CMake backend generation, build, and test)
# Test build without optimizations and with asan
- mkdir -p build
- cd build
- cmake .. -DFORT_BUILD_TYPE=asan
- cmake --build . --target all
- ls
- ./libfort_example
- ./libfort_test_dev
- ./libfort_test

View File

@ -2927,8 +2927,7 @@ static fort_status_t set_cell_property_impl(fort_cell_props_t *opt, uint32_t pro
if (v == FT_TSTYLE_DEFAULT) {
opt->cell_text_style = FT_TSTYLE_DEFAULT;
} else {
// opt->cell_text_style = (enum ft_text_style)(opt->cell_text_style | v);
opt->cell_text_style |= v;
opt->cell_text_style = (enum ft_text_style)(opt->cell_text_style | v);
}
} else if (PROP_IS_SET(property, FT_CPROP_CONT_TEXT_STYLE)) {
enum ft_text_style v = (enum ft_text_style)value;

View File

@ -471,8 +471,7 @@ static fort_status_t set_cell_property_impl(fort_cell_props_t *opt, uint32_t pro
if (v == FT_TSTYLE_DEFAULT) {
opt->cell_text_style = FT_TSTYLE_DEFAULT;
} else {
// opt->cell_text_style = (enum ft_text_style)(opt->cell_text_style | v);
opt->cell_text_style |= v;
opt->cell_text_style = (enum ft_text_style)(opt->cell_text_style | v);
}
} else if (PROP_IS_SET(property, FT_CPROP_CONT_TEXT_STYLE)) {
enum ft_text_style v = (enum ft_text_style)value;