From f521d779fbdf0dd42db5274a4645419072b1b148 Mon Sep 17 00:00:00 2001
From: Dirk Ziegelmeier <dirk@ziegelmeier.net>
Date: Sat, 13 Oct 2018 09:49:48 +0200
Subject: [PATCH] Work on Travis-CI

---
 .travis.yml | 11 +++++++----
 travis.sh   |  4 ----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bc0b8aff..48098f7f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ sudo: false
 
 matrix:
   include:
-    - compiler: gcc
+    - compiler: gcc-7
       addons:
         apt:
           sources:
@@ -13,8 +13,10 @@ matrix:
             - check
             - libsubunit-dev
             - gcc-7
-      env: COMPILER=gcc-7
-    - compiler: clang
+      env:
+        - LSAN_OPTIONS=verbosity=1:log_threads=1
+
+    - compiler: clang-6.0
       addons:
         apt:
           sources:
@@ -24,7 +26,8 @@ matrix:
             - check
             - libsubunit-dev
             - clang-6.0
-      env: COMPILER=clang-6.0
+      env:
+        - LSAN_OPTIONS=verbosity=1:log_threads=1
 
 addons:
   apt:
diff --git a/travis.sh b/travis.sh
index d10b7856..545dbb75 100755
--- a/travis.sh
+++ b/travis.sh
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-if [ "$COMPILER" ];
-then
-	export CC=$COMPILER
-fi
 cd contrib/ports/unix/check
 #build and run unit tests
 make clean all