Merge branch 'master' into testinc

.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:
@@ -26,7 +20,7 @@ before_script:
   - ./ci/setup.sh
 
 script:
-  - ./ci/check.sh
+  - ./ci/build.sh
 
 addons:
   apt:

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

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".'
 

ci/build.sh

@@ -16,6 +16,7 @@ cd build
 cmake .. ${CFG}
 make -j2
 make test
+make integration
 
 cd ..
 

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" $@