From 01ffc392690f14be3a8b7310c570aca925bf9716 Mon Sep 17 00:00:00 2001
From: benrubson <ben.rubson@gmail.com>
Date: Tue, 8 Aug 2017 17:50:44 +0200
Subject: [PATCH 1/2] Re-enable integration tests in Travis

---
 .travis.yml               |  2 +-
 INSTALL.md                | 10 +++++++---
 build.sh                  |  5 +++++
 ci/{check.sh => build.sh} |  1 +
 4 files changed, 14 insertions(+), 4 deletions(-)
 rename ci/{check.sh => build.sh} (93%)

diff --git a/.travis.yml b/.travis.yml
index 5bd591f..2af3032 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@ before_script:
   - ./ci/setup.sh
 
 script:
-  - ./ci/check.sh
+  - ./ci/build.sh
 
 addons:
   apt:
diff --git a/INSTALL.md b/INSTALL.md
index 662f4d0..f8f0302 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -10,7 +10,11 @@ Compiling EncFS
 
 EncFS uses the CMake toolchain to create makefiles.
 
-Steps to build EncFS:
+Quickest way to build and test EncFS :
+
+    ./build.sh
+
+Or following are the detailed steps to build EncFS:
 
     mkdir build
     cd build
@@ -29,11 +33,11 @@ encrypted filesystem and run tests on it:
     make integration
 
 The compilation process creates two executables, encfs and encfsctl in
-the encfs directory.  You can install to in a system directory via
+the encfs directory.  You can install to in a system directory via:
 
     make install
 
-. If the default path (`/usr/local`) is not where you want things
+If the default path (`/usr/local`) is not where you want things
 installed, then set the CMAKE_INSTALL_PREFIX option when running cmake.  Eg:
 
     cmake .. -DCMAKE_INSTALL_PREFIX=/opt/local
diff --git a/build.sh b/build.sh
index 87985de..de8b847 100755
--- a/build.sh
+++ b/build.sh
@@ -12,4 +12,9 @@ then
 fi
 
 make -j2 -C build
+make test -C build
+make integration -C build
+
+echo
+echo 'Everything looks good, you can install via "make install -C build".'
 
diff --git a/ci/check.sh b/ci/build.sh
similarity index 93%
rename from ci/check.sh
rename to ci/build.sh
index 5d5e9ca..4d30a46 100755
--- a/ci/check.sh
+++ b/ci/build.sh
@@ -16,6 +16,7 @@ cd build
 cmake .. ${CFG}
 make -j2
 make test
+make integration
 
 cd ..
 

From 5dfa28508e399a0b96ffe57d0f968e4beed2f471 Mon Sep 17 00:00:00 2001
From: Valient Gough <valient@gmail.com>
Date: Tue, 8 Aug 2017 23:34:32 -0400
Subject: [PATCH 2/2] switch to osx_image xcode8.3

---
 .travis.yml | 18 ++++++------------
 devmode     |  2 +-
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5bd591f..1518736 100644
--- 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:
diff --git a/devmode b/devmode
index f77a73a..33df3a2 100755
--- a/devmode
+++ b/devmode
@@ -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" $@