Exercise the new symbol prefix option in CI tests

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index aac24c7b2b1fc48f4cd28645ff040e6fe2c12106..267e84534143e1c4f98a37a3895718da681c3c45 100644 (file)
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -18,6 +18,18 @@ jobs:
             cmake-args: -DWITH_SANITIZER=Address
             codecov: ubuntu_gcc
 
+          - name: Ubuntu GCC Symbol Prefix
+            os: ubuntu-latest
+            compiler: gcc
+            cmake-args: -DZLIB_SYMBOL_PREFIX=zTest_
+            codecov: ubuntu_gcc_sprefix
+
+          - name: Ubuntu GCC Compat SPrefix
+            os: ubuntu-latest
+            compiler: gcc
+            cmake-args: -DZLIB_COMPAT=ON -DZLIB_SYMBOL_PREFIX=zTest_
+            codecov: ubuntu_gcc_compat_sprefix
+
           - name: Ubuntu GCC OSB -O1 No Unaligned64
             os: ubuntu-latest
             compiler: gcc

diff --git a/.github/workflows/configure.yml b/.github/workflows/configure.yml
index 3892932b8c6c689e76813a7a85d2f20ae659894f..cb404f537f5cff6bfecc0bb394ad1bb9bc64489d 100644 (file)
--- a/.github/workflows/configure.yml
+++ b/.github/workflows/configure.yml
@@ -186,6 +186,16 @@ jobs:
             cflags: -static
             ldflags: -static
 
+          - name: macOS GCC symbol prefix
+            os: macOS-latest
+            compiler: gcc
+            configure-args: --sprefix=zTest_
+
+          - name: macOS GCC symbol prefix & compat
+            os: macOS-latest
+            compiler: gcc
+            configure-args: --zlib-compat --sprefix=zTest_
+
           - name: macOS GCC
             os: macOS-latest
             compiler: gcc

diff --git a/.github/workflows/nmake.yml b/.github/workflows/nmake.yml
index 38c0b42ebf4190b14afb507f7302b076045ca7b4..da6d99d2026f5a1af77d9fdebdc5e34057eeb3d3 100644 (file)
--- a/.github/workflows/nmake.yml
+++ b/.github/workflows/nmake.yml
@@ -13,6 +13,24 @@ jobs:
             makefile: win32/Makefile.msc
             vc-vars: x86
 
+          - name: Windows NMake x64 compat
+            os: windows-latest
+            makefile: win32/Makefile.msc
+            vc-vars: x86_amd64
+            additional-args: ZLIB_COMPAT=yes
+
+          - name: Windows NMake x64 sprefix
+            os: windows-latest
+            makefile: win32/Makefile.msc
+            vc-vars: x86_amd64
+            additional-args: SYMBOL_PREFIX=zTest_
+
+          - name: Windows NMake x64 sprefix compat
+            os: windows-latest
+            makefile: win32/Makefile.msc
+            vc-vars: x86_amd64
+            additional-args: ZLIB_COMPAT=yes SYMBOL_PREFIX=zTest_
+
           - name: Windows NMake x64
             os: windows-latest
             makefile: win32/Makefile.msc
@@ -36,7 +54,7 @@ jobs:
       shell: cmd
       run: |
         call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.vc-vars }}
-        nmake -f ${{ matrix.makefile }}
+        nmake -f ${{ matrix.makefile }} ${{ matrix.additional-args }}
 
     - name: Run test cases
       shell: cmd
@@ -44,5 +62,5 @@ jobs:
       if: contains(matrix.vc-vars, 'arm') == false
       run: |
         call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.vc-vars }}
-        nmake -f ${{ matrix.makefile }} test
-        nmake -f ${{ matrix.makefile }} testdll
+        nmake -f ${{ matrix.makefile }} ${{ matrix.additional-args }} test
+        nmake -f ${{ matrix.makefile }} ${{ matrix.additional-args }} testdll

diff --git a/.github/workflows/pigz.yml b/.github/workflows/pigz.yml
index 8260c82fb7663b080e3b2718d3759c1e2794d1e7..bce94fa4eace9100e1a197b491177652b194059a 100644 (file)
--- a/.github/workflows/pigz.yml
+++ b/.github/workflows/pigz.yml
@@ -13,6 +13,12 @@ jobs:
             compiler: gcc
             codecov: ubuntu_gcc_pigz
 
+          - name: Ubuntu GCC Symbol Prefix
+            os: ubuntu-latest
+            compiler: gcc
+            codecov: ubuntu_gcc_pigz
+            cmake-args: -DZLIB_SYMBOL_PREFIX=zTest_
+
           - name: Ubuntu Clang
             os: ubuntu-latest
             compiler: clang

diff --git a/.github/workflows/pkgcheck.yml b/.github/workflows/pkgcheck.yml
index c74e41aec9ef7443fd3e216299522a92d9ea6bf6..780c6e86f94d458f384919145c9f71c3ed9d03dd 100644 (file)
--- a/.github/workflows/pkgcheck.yml
+++ b/.github/workflows/pkgcheck.yml
@@ -58,6 +58,12 @@ jobs:
             cmake-args: -DWITH_NATIVE_INSTRUCTIONS=ON
             configure-args: --native
 
+          - name: macOS Clang Symbol Prefix
+            os: macOS-latest
+            compiler: clang
+            cmake-args: -DZLIB_SYMBOL_PREFIX=zTest_
+            configure-args: --sprefix=zTest_
+
     steps:
     - name: Checkout repository
       uses: actions/checkout@v1