Merge branch 'develop' of github.com:cryfs/cryfs into develop

This commit is contained in:
Sebastian Messmer 2015-10-28 01:56:21 +01:00
commit 6e91810b61
2 changed files with 5 additions and 0 deletions

1
.gitignore vendored
View File

@ -29,3 +29,4 @@
# Biicode directory
bii
bin

View File

@ -18,7 +18,11 @@ before_script:
script:
#The configure line is needed as a workaround for the following link, otherwise we wouldn't need "bii configure" at all because "bii build" calls it: http://forum.biicode.com/t/error-could-not-find-the-following-static-boost-libraries-boost-thread/374
- bii cpp:configure || bii cpp:configure
# Build cryfs executable
- bii cpp:build -- -j2
# Make distribution packages
- cd bii/build/messmer_cryfs && make package
# Build and run test cases
- bii cpp:build --target messmer_cryfs_test_main -- -j2
- wget https://raw.githubusercontent.com/smessmer/travis-utils/master/run_with_fuse.sh
&& chmod +x run_with_fuse.sh