From 4860fddb723c36fc24712fc5f4b63a6a46dfca9c Mon Sep 17 00:00:00 2001
From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 13 Jan 2022 14:10:08 +0000
Subject: Merge r1896971, r1896990, r1896992 from trunk:

Add Asan builds to travis.

Disable odbc tests with ASan for now, dlclose() leaks memory somehow.

Move misplaced comment.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1896996 13f79535-47bb-0310-9956-ffa450edef68
---
 .travis.yml | 39 +++++++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 95f3623dd..52343512d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,16 +22,47 @@ matrix:
     - name: Maintainer-mode, no IPv6
       env: CONFIG="--enable-maintainer-mode --disable-ipv6"
     - name: Maintainer-mode, -Werror
-      env: NOTEST_CFLAGS=-Werror CONFIG="--enable-maintainer-mode"
+      env: NOTEST_CFLAGS=-Werror
+           CONFIG="--enable-maintainer-mode"
     - name: Maintainer-mode, -Werror (Xenial)
       dist: xenial
-      env: NOTEST_CFLAGS=-Werror CONFIG="--enable-maintainer-mode"
+      env: NOTEST_CFLAGS=-Werror
+           CONFIG="--enable-maintainer-mode"
     - name: Maintainer-mode, -Werror (Focal)
       dist: focal
-      env: NOTEST_CFLAGS=-Werror CONFIG="--enable-maintainer-mode"
+      env: NOTEST_CFLAGS=-Werror
+           CONFIG="--enable-maintainer-mode"
     - name: GCC 10, maintainer-mode, -Werror (Focal)
       dist: focal
-      env: NOTEST_CFLAGS="-Werror -O2" CONFIG="--enable-maintainer-mode" CC=gcc-10
+      env: CC=gcc-10
+           NOTEST_CFLAGS="-Werror -O2"
+           CONFIG="--enable-maintainer-mode"
+      addons:
+        apt:
+          sources:
+            - sourceline: 'ppa:ubuntu-toolchain-r/test'
+          packages:
+            - libtool-bin
+            - gcc-10
+    - name: GCC-10, ASan (Focal)
+      dist: focal
+      # w/o ODBC since DSO unload leaks memory and fails the tests
+      env: CC=gcc-10
+           NOTEST_CFLAGS="-fsanitize=address -fno-sanitize-recover=address -fno-omit-frame-pointer -Werror -O2"
+           CONFIG="--with-odbc=no"
+      addons:
+        apt:
+          sources:
+            - sourceline: 'ppa:ubuntu-toolchain-r/test'
+          packages:
+            - libtool-bin
+            - gcc-10
+    - name: GCC-10, ASan, pool-debug (Focal)
+      dist: focal
+      # w/o ODBC since DSO unload leaks memory and fails the tests
+      env: CC=gcc-10
+           NOTEST_CFLAGS="-fsanitize=address -fno-sanitize-recover=address -fno-omit-frame-pointer -Werror -O2"
+           CONFIG="--enable-pool-debug --with-odbc=no"
       addons:
         apt:
           sources:
-- 
cgit v1.2.1