From 71814a26f2f9c86cfe81c77a08c84e00bd08e90b Mon Sep 17 00:00:00 2001
From: Yann Collet <cyan@fb.com>
Date: Thu, 17 Nov 2016 18:41:26 -0800
Subject: [PATCH] switch usan32 tests to gcc-5

---
 .travis.yml | 8 ++++----
 Makefile    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3ab2647..785553a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,17 +31,17 @@ matrix:
           packages:
             - gcc-6
 
-    - env: Ubu=14.04 Cmd='make sanitize32' COMPILER=clang
+    - env: Ubu=14.04 Cmd='make usan32' COMPILER=gcc-5
       dist: trusty
       sudo: required
       addons:
         apt:
           packages:
             - clang
-            - libc6-dev-i386
-            - gcc-multilib
+            - gcc-5
+            - gcc-5-multilib
 
-    - env: Ubu=14.04 Cmd='make sanitize' COMPILER=clang
+    - env: Ubu=14.04 Cmd='make usan' COMPILER=clang
       dist: trusty
       sudo: required
       addons:
diff --git a/Makefile b/Makefile
index 3a5af81..15acdf9 100644
--- a/Makefile
+++ b/Makefile
@@ -106,11 +106,11 @@ clangtest-native: clean
 	@CFLAGS="-O3 -Werror -Wconversion -Wno-sign-conversion" $(MAKE) -C $(PRGDIR)  native CC=clang
 	@CFLAGS="-O3 -Werror -Wconversion -Wno-sign-conversion" $(MAKE) -C $(TESTDIR) native CC=clang
 
-sanitize: clean
-	CFLAGS="-O3 -g -fsanitize=undefined" $(MAKE) test CC=clang FUZZER_TIME="-T1mn" NB_LOOPS=-i1
+usan: clean
+	CC=clang CFLAGS="-O3 -g -fsanitize=undefined" $(MAKE) test FUZZER_TIME="-T1mn" NB_LOOPS=-i1
 
-sanitize32: clean
-	CFLAGS="-m32 -O3 -g -fsanitize=undefined" $(MAKE) test CC=clang FUZZER_TIME="-T1mn" NB_LOOPS=-i1
+usan32: clean
+	CC=clang CFLAGS="-m32 -O3 -g -fsanitize=undefined" $(MAKE) test FUZZER_TIME="-T1mn" NB_LOOPS=-i1
 
 staticAnalyze: clean
 	CFLAGS=-g scan-build --status-bugs -v $(MAKE) all
-- 
2.7.4