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