From 18dd7cc9af1f1f87522cb6c1a8cec867b6d57b7d Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 19 Oct 2020 11:13:05 +0200
Subject: CI/travis: add brotli and zstd to the libssh2 build

... to make sure such tests are run with valgrind. Suppress the zstd
valgrind warnings we get with version 1.3.3 on Ubuntu 18.04 (for debug
and non-debug builds).

Closes #6105
---
 .travis.yml         |  2 ++
 tests/valgrind.supp | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 2832a9cac..e69353574 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,6 +59,8 @@ jobs:
         - *common_packages
         - krb5-user
         - libssh2-1-dev
+        - libbrotli-dev
+        - libzstd-dev
   - env:
     - T=normal C=--with-libssh
     # Avoid bionic, its pre-release libssh version triggers deprecation warnings.
diff --git a/tests/valgrind.supp b/tests/valgrind.supp
index 10b07314a..6d72a8bb4 100644
--- a/tests/valgrind.supp
+++ b/tests/valgrind.supp
@@ -1,3 +1,35 @@
+{
+   zstd_decompression-1.3.3-on-Ubuntu-18.04
+   Memcheck:Cond
+   fun:ZSTD_decompressStream
+   fun:zstd_unencode_write
+   fun:Curl_unencode_write
+   fun:readwrite_data
+   fun:Curl_readwrite
+   fun:multi_runsingle
+   fun:curl_multi_perform
+   fun:easy_transfer
+   fun:easy_perform
+   fun:curl_easy_perform
+   fun:serial_transfers
+   fun:run_all_transfers
+   fun:operate
+   fun:main
+}
+
+{
+   zstd_decompression-1.3.3-on-Ubuntu-18.04-nondebug
+   Memcheck:Cond
+   fun:ZSTD_decompressStream
+   fun:zstd_unencode_write
+   fun:Curl_readwrite
+   fun:multi_runsingle
+   fun:curl_multi_perform
+   fun:curl_easy_perform
+   fun:operate
+   fun:main
+}
+
 {
    libidn-idna_to_ascii-error
    Memcheck:Addr4
-- 
cgit v1.2.1