Skip to content

Commit fc54a3e

Browse files
committed
Add zstd to CI tests
1 parent 670d292 commit fc54a3e

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

.github/workflows/test.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ jobs:
6767
sudo apt-get install -y libc6-dev${{ matrix.config.arch_suffix }} libstdc++-13-dev${{ matrix.config.arch_suffix }} \
6868
libssl-dev${{ matrix.config.arch_suffix }} libcurl4-openssl-dev${{ matrix.config.arch_suffix }} \
6969
zlib1g-dev${{ matrix.config.arch_suffix }} libbrotli-dev${{ matrix.config.arch_suffix }}
70+
libzstd-dev${{ matrix.config.arch_suffix }}
7071
- name: build and run tests
7172
run: cd test && make EXTRA_CXXFLAGS="${{ matrix.config.arch_flags }}"
7273
- name: run fuzz test target
@@ -126,7 +127,7 @@ jobs:
126127
- name: Setup msbuild on windows
127128
uses: microsoft/setup-msbuild@v2
128129
- name: Install vcpkg dependencies
129-
run: vcpkg install gtest curl zlib brotli
130+
run: vcpkg install gtest curl zlib brotli zstd
130131
- name: Install OpenSSL
131132
if: ${{ matrix.config.with_ssl }}
132133
run: choco install openssl
@@ -139,6 +140,7 @@ jobs:
139140
-DHTTPLIB_COMPILE=${{ matrix.config.compiled && 'ON' || 'OFF' }}
140141
-DHTTPLIB_REQUIRE_ZLIB=ON
141142
-DHTTPLIB_REQUIRE_BROTLI=ON
143+
-DHTTPLIB_REQUIRE_ZSTD=ON
142144
-DHTTPLIB_REQUIRE_OPENSSL=${{ matrix.config.with_ssl && 'ON' || 'OFF' }}
143145
- name: Build ${{ matrix.config.name }}
144146
run: cmake --build build --config Release -- /v:m /clp:ShowCommandLine

test/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ ZLIB_SUPPORT = -DCPPHTTPLIB_ZLIB_SUPPORT -lz
1818
BROTLI_DIR = $(PREFIX)/opt/brotli
1919
BROTLI_SUPPORT = -DCPPHTTPLIB_BROTLI_SUPPORT -I$(BROTLI_DIR)/include -L$(BROTLI_DIR)/lib -lbrotlicommon -lbrotlienc -lbrotlidec
2020

21-
TEST_ARGS = gtest/src/gtest-all.cc gtest/src/gtest_main.cc -Igtest -Igtest/include $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT) -pthread -lcurl
21+
ZSTD_SUPPORT = -DCPPHTTPLIB_ZSTD_SUPPORT -lzstd
22+
23+
TEST_ARGS = gtest/src/gtest-all.cc gtest/src/gtest_main.cc -Igtest -Igtest/include $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT) $(ZSTD_SUPPORT) -pthread -lcurl
2224

2325
# By default, use standalone_fuzz_target_runner.
2426
# This runner does no fuzzing, but simply executes the inputs

0 commit comments

Comments
 (0)