From 06b8e466fd5db6f6df344764ac5832587d03c126 Mon Sep 17 00:00:00 2001
From: Jan Breuer <jan.breuer@jaybee.cz>
Date: 周五, 07 7月 2017 21:03:33 +0800
Subject: [PATCH] Merge pull request #86 from RedPitaya/master

---
 .travis.yml |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0354b01..91f6d8f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,8 @@
 before_script:
   - wget http://downloads.sourceforge.net/project/cunit/CUnit/2.1-3/CUnit-2.1-3.tar.bz2 -O /tmp/cunit.tar.bz2
   - tar -xvf /tmp/cunit.tar.bz2
-  - cd CUnit-2.1-3
+  - mv CUnit-2.1-3 CUnit
+  - cd CUnit
   - CFLAGS="-m32" LDFLAGS="-m32" ./bootstrap
   - make
   - export LD_LIBRARY_PATH=$PWD/CUnit/Sources/.libs/:$LD_LIBRARY_PATH
@@ -23,8 +24,14 @@
 script:
   - make
   - CC=clang CFLAGS="-g -O0 -fsanitize=address" LDFLAGS="-g -fsanitize=address" make clean test
-  - CFLAGS="-m32" LDFLAGS="-m32 -L$PWD/CUnit-2.1-3/CUnit/Sources/.libs/" make clean test
+  - CC=clang CFLAGS="-g -O0 -fsanitize=address -DUSE_DEVICE_DEPENDENT_ERROR_INFORMATION=0" LDFLAGS="-g -fsanitize=address" make clean test
+  - CC=clang CFLAGS="-g -O0 -fsanitize=address -DUSE_MEMORY_ALLOCATION_FREE=0" LDFLAGS="-g -fsanitize=address" make clean test
+  - CFLAGS="-m32" LDFLAGS="-m32 -L$PWD/CUnit/CUnit/Sources/.libs/" make clean test
+  - CFLAGS="-m32 -std=c89" LDFLAGS="-m32 -L$PWD/CUnit/CUnit/Sources/.libs/" make clean test
+  - CFLAGS="-m32 -std=c90" LDFLAGS="-m32 -L$PWD/CUnit/CUnit/Sources/.libs/" make clean test
+  - CFLAGS="-m32 -std=c99" LDFLAGS="-m32 -L$PWD/CUnit/CUnit/Sources/.libs/" make clean test
+  - CFLAGS="-m32 -std=gnu99" LDFLAGS="-m32 -L$PWD/CUnit/CUnit/Sources/.libs/" make clean test
   - LDFLAGS="-lgcov" CFLAGS="-fprofile-arcs -ftest-coverage" make clean all test
 
 after_success:
-  - coveralls -b libscpi/ -e libscpi/test -e examples -e libscpi/obj/shared --gcov-options '\-lp'
+  - coveralls -b libscpi/ -e libscpi/test -e examples -e CUnit -e libscpi/obj/shared --gcov-options '\-lp'

--
Gitblit v1.9.1