From 8f536a43b15daf1ff7e8c0cffe387f8227f72dd3 Mon Sep 17 00:00:00 2001
From: Yann Collet <cyan@fb.com>
Date: Thu, 17 Nov 2016 18:06:22 -0800
Subject: added sanitize32 tests to Travis

---
 .travis.yml | 38 +++++++++++++++++++++++---------------
 Makefile    |  3 +++
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 58eee4c..12d7816 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,32 +21,50 @@ matrix:
 
 
     # 14.04 LTS Server Edition 64 bit
-    - env: Ubu=14.04 Cmd='make -C tests test-lz4c32 test-fullbench32 versionsTest' COMPILER=cc
+    - env: Ubu=14.04 Cmd='make c_standards CC=gcc-6 && make -C tests test-lz4 CC=gcc-6 MOREFLAGS=-Werror' COMPILER=gcc-6
+      dist: trusty
+      sudo: required
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - gcc-6
+
+    - env: Ubu=14.04 Cmd='make sanitize32' COMPILER=clang
       dist: trusty
       sudo: required
       addons:
         apt:
           packages:
-            - python3
             - libc6-dev-i386
             - gcc-multilib
 
-    - env: Ubu=14.04 Cmd='make -C tests test-frametest32 test-fuzzer32' COMPILER=cc
+    - env: Ubu=14.04 Cmd='make sanitize' COMPILER=clang
       dist: trusty
       sudo: required
       addons:
         apt:
           packages:
+
+    - env: Ubu=14.04 Cmd='make -C tests test-lz4c32 test-fullbench32 versionsTest' COMPILER=cc
+      dist: trusty
+      sudo: required
+      addons:
+        apt:
+          packages:
+            - python3
             - libc6-dev-i386
             - gcc-multilib
 
-    - env: Ubu=14.04 Cmd='make sanitize' COMPILER=clang
+    - env: Ubu=14.04 Cmd='make -C tests test-frametest32 test-fuzzer32' COMPILER=cc
       dist: trusty
       sudo: required
       addons:
         apt:
           packages:
-            - valgrind
+            - libc6-dev-i386
+            - gcc-multilib
 
     - env: Ubu=14.04 Cmd='make staticAnalyze' COMPILER=clang
       dist: trusty
@@ -100,16 +118,6 @@ matrix:
             - gcc-5
             - gcc-5-multilib
 
-    - env: Ubu=14.04 Cmd='make c_standards CC=gcc-6 && make -C tests test-lz4 CC=gcc-6 MOREFLAGS=-Werror' COMPILER=gcc-6
-      dist: trusty
-      sudo: required
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - gcc-6
-
     - env: Ubu=14.04 Cmd='make -C tests test-lz4 CC=clang-3.8' COMPILER=clang-3.8
       dist: trusty
       sudo: required
diff --git a/Makefile b/Makefile
index be662a5..3a5af81 100644
--- a/Makefile
+++ b/Makefile
@@ -109,6 +109,9 @@ clangtest-native: clean
 sanitize: clean
 	CFLAGS="-O3 -g -fsanitize=undefined" $(MAKE) test CC=clang FUZZER_TIME="-T1mn" NB_LOOPS=-i1
 
+sanitize32: clean
+	CFLAGS="-m32 -O3 -g -fsanitize=undefined" $(MAKE) test CC=clang FUZZER_TIME="-T1mn" NB_LOOPS=-i1
+
 staticAnalyze: clean
 	CFLAGS=-g scan-build --status-bugs -v $(MAKE) all
 
-- 
cgit v0.12