diff options
| author | Sebastian Pipping <sebastian@pipping.org> | 2021-12-26 18:45:34 +0100 |
|---|---|---|
| committer | Sebastian Pipping <sebastian@pipping.org> | 2021-12-28 01:25:16 +0100 |
| commit | 23e820aa2572df776aee4abce7a148ee26b3deca (patch) | |
| tree | 86e81dc0ae4c738b327e0b4fa7e5c3b2ac7e968e | |
| parent | befef7e52ada1f9382bec74af7226f4b84054c57 (diff) | |
| download | libexpat-git-23e820aa2572df776aee4abce7a148ee26b3deca.tar.gz | |
coverage.sh: Start coveraging -m32
| -rw-r--r-- | .github/workflows/coverage.yml | 2 | ||||
| -rwxr-xr-x | expat/coverage.sh | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 81bdb400..b9bdee57 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -59,6 +59,8 @@ jobs: cmake \ docbook2x \ dos2unix \ + gcc-multilib \ + g++-multilib \ lcov \ libbsd-dev \ lzip \ diff --git a/expat/coverage.sh b/expat/coverage.sh index c87e326d..030c26d5 100755 --- a/expat/coverage.sh +++ b/expat/coverage.sh @@ -59,7 +59,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}__unicode_${unicode_enabled}__xml_context_${xml_context}${libbsd_part}${mingw_part}${char_part}${xml_attr_part}${m32_part}" } @@ -85,6 +90,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 +282,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 +300,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...' |