From b537fa15eed68a98a621f93f52b5873b0a11ffc8 Mon Sep 17 00:00:00 2001
From: gumi <git@gumi.ca>
Date: Sat, 17 Feb 2018 17:54:55 -0500
Subject: release v18.2.17.1

---
 .travis.yml | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 44153a8..26bef5c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -85,6 +85,21 @@ matrix:
           - libgtest-dev
           - valgrind
           - gdb
+    # Can't use valgrind and asan at the same time.
+    # Should probably fix the test leaks though.
+    - compiler: gcc
+      env: REAL_CC=gcc-5     REAL_CXX=g++-5  REAL_EXTRA=-fsanitize=address  FORCE_TESTER='' ASAN_OPTIONS=detect_leaks=0   LDFLAGS="-fuse-ld=gold"
+      addons:
+        apt:
+          sources:
+          - ubuntu-toolchain-r-test
+          packages:
+          - g++-5
+          - libstdc++6-5-dbg
+          - libgtest-dev
+          # - valgrind
+          - gdb
+  allow_failures:
     - compiler: gcc
       env: REAL_CC=gcc-4.7     REAL_CXX=g++-4.7   LDFLAGS="-fuse-ld=gold"
       addons:
@@ -133,20 +148,6 @@ matrix:
           - libgtest-dev
           - valgrind
           - gdb
-    # Can't use valgrind and asan at the same time.
-    # Should probably fix the test leaks though.
-    - compiler: gcc
-      env: REAL_CC=gcc-5     REAL_CXX=g++-5  REAL_EXTRA=-fsanitize=address  FORCE_TESTER='' ASAN_OPTIONS=detect_leaks=0   LDFLAGS="-fuse-ld=gold"
-      addons:
-        apt:
-          sources:
-          - ubuntu-toolchain-r-test
-          packages:
-          - g++-5
-          - libstdc++6-5-dbg
-          - libgtest-dev
-          # - valgrind
-          - gdb
     # LTO is buggy.
     - compiler: gcc
       env: REAL_CC=gcc-5     REAL_CXX=g++-5  REAL_EXTRA=-flto   LDFLAGS="-fuse-ld=gold"
@@ -160,8 +161,6 @@ matrix:
           - libgtest-dev
           - valgrind
           - gdb
-  allow_failures:
-    - env: REAL_CC=gcc-5     REAL_CXX=g++-5  REAL_EXTRA=-flto  LDFLAGS="-fuse-ld=gold"
 
 # everything that was pushed to stable was already on 'master', except
 # the version change and some doc changes.
-- 
cgit v1.2.3-60-g2f50