mirror of
https://github.com/vgough/encfs.git
synced 2024-11-21 23:43:26 +01:00
special case Linux Travis setup
This commit is contained in:
parent
a98efa9a0b
commit
a8eebf3d8e
@ -23,8 +23,7 @@ branches:
|
||||
- travis
|
||||
|
||||
before_script:
|
||||
- sudo modprobe fuse
|
||||
- cmake --version
|
||||
- ./ci/setup.sh
|
||||
|
||||
script:
|
||||
- ./ci/check.sh
|
||||
|
2
build.sh
2
build.sh
@ -7,7 +7,7 @@ if [[ ! -d build ]]
|
||||
then
|
||||
mkdir build
|
||||
cd build
|
||||
cmake ..
|
||||
cmake .. $*
|
||||
cd ..
|
||||
fi
|
||||
|
||||
|
11
ci/check.sh
11
ci/check.sh
@ -1,12 +1,19 @@
|
||||
#!/bin/bash -eu
|
||||
|
||||
cmake --version
|
||||
|
||||
CFG=""
|
||||
if [ "$TRAVIS_OS_NAME" = "osx" ]; then
|
||||
CFG="-DENABLE_NLS=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl"
|
||||
fi
|
||||
|
||||
if [[ ! -d build ]]
|
||||
then
|
||||
mkdir build
|
||||
mkdir build
|
||||
fi
|
||||
|
||||
cd build
|
||||
cmake ..
|
||||
cmake .. ${CFG}
|
||||
make -j2
|
||||
make test
|
||||
|
||||
|
10
ci/setup.sh
Executable file
10
ci/setup.sh
Executable file
@ -0,0 +1,10 @@
|
||||
#!/bin/bash -eu
|
||||
|
||||
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
|
||||
sudo modprobe fuse
|
||||
fi
|
||||
|
||||
if [ "$TRAVIS_OS_NAME" == "osx" ]; then
|
||||
brew cask install osxfuse
|
||||
fi
|
||||
|
@ -1035,7 +1035,7 @@ RootPtr createV6Config(EncFS_Context *ctx,
|
||||
alg = findCipherAlgorithm("AES", keySize);
|
||||
|
||||
// If case-insensitive system, opt for Block32 filename encoding
|
||||
#if DEFAULT_CASE_INSENSITIVE
|
||||
#if defined(DEFAULT_CASE_INSENSITIVE)
|
||||
nameIOIface = BlockNameIO::CurrentInterface(true);
|
||||
#else
|
||||
nameIOIface = BlockNameIO::CurrentInterface();
|
||||
|
Loading…
Reference in New Issue
Block a user