Merge branch 'master' into build

2024-11-21 15:33:16 +01:00 · 2017-08-09 00:34:59 -04:00 · 2017-08-09 00:34:59 -04:00 · da06619901
commit da06619901
parent 01ffc39269 5682ade36d
2 changed files with 7 additions and 13 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -1,21 +1,15 @@
-dist: trusty
-
 language: cpp

 sudo: true

-os:
-  - linux
-  - osx
-
-compiler:
-  - clang
-  - gcc
-
 matrix:
-  exclude:
-    - os: osx
+  include:
+    - os: linux
      compiler: gcc
+      dist: trusty
+    - os: osx
+      compiler: clang
+      osx_image: xcode8.3

 branches:
  only:
--- a/2
+++ b/2
@ -2,4 +2,4 @@
 # After running, chdir to the build subdir ane run "make"
 mkdir build
 cd build && cmake .. -DCMAKE_BUILD_TYPE=Debug -DLINT=ON \
-  -DCMAKE_CXX_FLAGS="-O1 -fsanitize=address -fno-omit-frame-pointer" $@
+  -DCMAKE_CXX_FLAGS="-O0 -g -fsanitize=address -fno-omit-frame-pointer" $@