From: Dženan Zukić <dzenan.zukic@kitware.com>
Date: Wed, 22 Sep 2021 21:08:06 +0000 (-0400)
Subject: Exercise the new symbol prefix option in CI tests
X-Git-Tag: 2.1.0-beta1~506
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b418e9c85ba06ff3bf8bc23f0704be2f308f732b;p=thirdparty%2Fzlib-ng.git

Exercise the new symbol prefix option in CI tests
---

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index aac24c7b2..267e84534 100644
--- 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 3892932b8..cb404f537 100644
--- 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 38c0b42eb..da6d99d20 100644
--- 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 8260c82fb..bce94fa4e 100644
--- 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 c74e41aec..780c6e86f 100644
--- 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