From 8b77cb4a87f7ef67b30a6809353ea984e7c3c090 Mon Sep 17 00:00:00 2001
From: Nikolaus Rath <Nikolaus@rath.org>
Date: Sat, 23 Jul 2016 09:58:03 -0700
Subject: [PATCH] Disable thread sanitizer, use newer gcc.

There's no point in having tests failing all the time,
we will re-enable thread sanitizer once we have figured
out if the errors are bugs or false positives (and, if they
are bugs, fixed them).
---
 .travis.yml | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 35c4be5..b90c8bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,21 +3,28 @@ language:
     - python
     - c
 python: "3.5"
-compiler: gcc clang
+compiler:
+    - gcc
+    - clang
+env:
+    - CC=gcc-6
+    - CC=clang
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - doxygen
+    - libtool
+    - automake
+    - autoconf
+    - gcc-6
 install:
-    - sudo apt-get update -qq
-    - sudo apt-get install -qq doxygen libtool automake autoconf
     - sudo python -m pip install pytest
 script:
+    - $CC --version
     - ./makeconf.sh
     - ./configure
-    - make -j4
+    - CFLAGS="-fsanitize=address,undefined -g -O1 -Wall -Werror" make
     - doxygen doc/Doxyfile
     - python -m pytest test/
-    - make clean
-    - make -j4 CC=clang CFLAGS="-fsanitize=address -g -O1"
-    - python -m pytest test/
-    - make clean
-    - make -j4 CC=clang CFLAGS="-fsanitize=thread,undefined -g -O1"
-    - python -m pytest test/
-
-- 
2.30.2