diff options
Diffstat (limited to 'expat/coverage.sh')
| -rwxr-xr-x | expat/coverage.sh | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/expat/coverage.sh b/expat/coverage.sh index c87e326d..49642aec 100755 --- a/expat/coverage.sh +++ b/expat/coverage.sh @@ -50,8 +50,14 @@ _get_build_dir() { fi local char_part= - if ${with_unsigned_char}; then - char_part=__unsigned_char + if ${unicode_enabled}; then + if ${with_unsigned_char}; then + char_part=__ushort + else + char_part=__wchar_t + fi + else + char_part=__char fi local xml_attr_part= @@ -59,7 +65,12 @@ _get_build_dir() { xml_attr_part=__attr_info fi - echo "build__${version}__unicode_${unicode_enabled}__xml_context_${xml_context}${libbsd_part}${mingw_part}${char_part}${xml_attr_part}" + local m32_part= + if ${with_m32}; then + m32_part=__m32 + fi + + echo "build__${version}__xml_context_${xml_context}${libbsd_part}${mingw_part}${char_part}${xml_attr_part}${m32_part}" } @@ -85,6 +96,7 @@ _call_cmake() { ${with_libbsd} && cmake_args+=( -DEXPAT_WITH_LIBBSD=ON ) ${with_mingw} && cmake_args+=( -DCMAKE_TOOLCHAIN_FILE="${abs_source_dir}"/cmake/mingw-toolchain.cmake ) + ${with_m32} && cmake_args+=( -D_EXPAT_M32=ON ) ( set -x @@ -276,6 +288,7 @@ _main() { # All combinations: with_unsigned_char=false with_libbsd=false + with_m32=false for with_mingw in true false ; do for unicode_enabled in true false ; do if ${unicode_enabled} && ! ${with_mingw} ; then @@ -293,6 +306,7 @@ _main() { # Single cases: with_libbsd=true _build_case with_unsigned_char=true _build_case + with_m32=true _build_case echo echo 'Merging coverage files...' |