Re-enable dynamic linking tests

Author: rhpvorderman

.github/workflows/ci.yml

@@ -120,33 +120,33 @@ jobs:
 
   # Test if the python-isal conda package can be build. Which is linked
   # dynamically to the conda isa-l package.
-#  test-dynamic:
-#    runs-on: ${{ matrix.os }}
-#    defaults:
-#      run:
-#        # This is needed for miniconda, see:
-#        # https://github.com/marketplace/actions/setup-miniconda#important.
-#        shell: bash -l {0}
-#    strategy:
-#      matrix:
-#        os: ["ubuntu-latest", "macos-latest", "windows-latest"]
-#    steps:
-#      - uses: actions/[email protected]
-#        with:
-#          submodules: recursive
-#      - name: Install miniconda.
-#        uses: conda-incubator/[email protected] # https://github.com/conda-incubator/setup-miniconda.
-#        with:
-#          channels: conda-forge,defaults
-#      - name: Install requirements (universal)
-#        run: conda install isa-l python tox
-#      - name: Set MSVC developer prompt
-#        uses: ilammy/[email protected]
-#        if: runner.os == 'Windows'
-#      - name: Run tests (dynamic link)
-#        run: tox
-#        env:
-#          PYTHON_ISAL_LINK_DYNAMIC: True
+  test-dynamic:
+    runs-on: ${{ matrix.os }}
+    defaults:
+      run:
+        # This is needed for miniconda, see:
+        # https://github.com/marketplace/actions/setup-miniconda#important.
+        shell: bash -l {0}
+    strategy:
+      matrix:
+        os: ["ubuntu-latest", "macos-latest", "windows-latest"]
+    steps:
+      - uses: actions/[email protected]
+        with:
+          submodules: recursive
+      - name: Install miniconda.
+        uses: conda-incubator/[email protected] # https://github.com/conda-incubator/setup-miniconda.
+        with:
+          channels: conda-forge,defaults
+      - name: Install requirements (universal)
+        run: conda install isa-l python tox
+      - name: Set MSVC developer prompt
+        uses: ilammy/[email protected]
+        if: runner.os == 'Windows'
+      - name: Run tests (dynamic link)
+        run: tox
+        env:
+          PYTHON_ISAL_LINK_DYNAMIC: True
 
   deploy:
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')

tests/test_compat.py

@@ -11,6 +11,7 @@
 
 import gzip
 import itertools
+import os
 import zlib
 from pathlib import Path
 
@@ -34,6 +35,8 @@
 # Wbits for ZLIB compression, GZIP compression, and RAW compressed streams
 WBITS_RANGE = list(range(9, 16)) + list(range(25, 32)) + list(range(-15, -8))
 
+DYNAMICALLY_LINKED = os.getenv("PYTHON_ISAL_LINK_DYNAMIC") is not None
+
 
 @pytest.mark.parametrize(["data_size", "value"],
                          itertools.product(DATA_SIZES, SEEDS))
@@ -90,6 +93,8 @@ def test_decompress_isal_zlib(data_size, level):
 @pytest.mark.parametrize(["data_size", "level", "wbits", "memLevel"],
                          itertools.product([128 * 1024], range(4),
                                            WBITS_RANGE, range(1, 10)))
+@pytest.mark.xfail(condition=DYNAMICALLY_LINKED,
+                   reason="Dynamically linked version may not have patch.")
 def test_compress_compressobj(data_size, level, wbits, memLevel):
     data = DATA[:data_size]
     compressobj = isal_zlib.compressobj(level=level,