root
/
xz
mirror of https://git.tukaani.org/xz.git
1
0
Fork 0
Code Issues Releases Wiki Activity

CI: Tests for disabling threading on CMake builds.

This commit is contained in:
Jia Tan 2023-03-28 22:48:24 +08:00
parent 8be5cc3b13
commit d0faa85df5
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/ci.yml vendored
View File

@ -89,12 +89,9 @@ jobs:
- name: Test without decoders - name: Test without decoders
run: ./build-aux/ci_build.sh -b ${{ matrix.build_system }} -d decoders,shared -p test -n no_decoders run: ./build-aux/ci_build.sh -b ${{ matrix.build_system }} -d decoders,shared -p test -n no_decoders
# Our CMake build cannot disable threads yet.
- name: Build without threads - name: Build without threads
if: ${{ matrix.build_system == 'autotools' }}
run: ./build-aux/ci_build.sh -b ${{ matrix.build_system }} -d threads,shared -p build run: ./build-aux/ci_build.sh -b ${{ matrix.build_system }} -d threads,shared -p build
- name: Test without threads - name: Test without threads
if: ${{ matrix.build_system == 'autotools' }}
run: ./build-aux/ci_build.sh -b ${{ matrix.build_system }} -d threads,shared -p test -n no_threads run: ./build-aux/ci_build.sh -b ${{ matrix.build_system }} -d threads,shared -p test -n no_threads
- name: Build without BCJ filters - name: Build without BCJ filters

4
build-aux/ci_build.sh
View File

@ -202,13 +202,13 @@ then
make make
;; ;;
cmake) cmake)
# The CMake build currently does not support disabling
# threading.
cd "$DEST_DIR" cd "$DEST_DIR"
add_to_filter_list "$BCJ" ";x86;powerpc;ia64;arm;armthumb;arm64;sparc" add_to_filter_list "$BCJ" ";x86;powerpc;ia64;arm;armthumb;arm64;sparc"
add_to_filter_list "$DELTA" ";delta" add_to_filter_list "$DELTA" ";delta"
add_extra_option "$THREADS" "-DENABLE_THREADS=ON" "-DENABLE_THREADS=OFF"
# Disable MicroLZMA if encoders are not configured. # Disable MicroLZMA if encoders are not configured.
add_extra_option "$ENCODERS" "-DENCODERS=$FILTER_LIST" "-DENCODERS= -DMICROLZMA_ENCODER=OFF" add_extra_option "$ENCODERS" "-DENCODERS=$FILTER_LIST" "-DENCODERS= -DMICROLZMA_ENCODER=OFF"