extern/encfs
1
0
Fork 0
mirror of https://github.com/vgough/encfs.git synced 2024-11-22 16:03:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Correct build env

Browse Source
This commit is contained in:
benrubson 2017-08-01 19:45:28 +02:00
parent 9e394a46c0
commit ce72ede28c
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/FindIntl.cmake
View File

@ -1,3 +1,8 @@
# This file comes from https://github.com/Kitware/CMake/blob/master/Modules/FindIntl.cmake
# It is needed for cmake < 3.2.0 which does not have it.
# When cmake 3.0.2 (Debian jessie version) will really be outdated, we will be able to
# delete this file and bump cmake version in CMakeLists.txt and INSTALL.md.
# Distributed under the OSI-approved BSD 3-Clause License. See accompanying # Distributed under the OSI-approved BSD 3-Clause License. See accompanying
# file Copyright.txt or https://cmake.org/licensing for details. # file Copyright.txt or https://cmake.org/licensing for details.

13
test.sh
View File

@ -4,15 +4,24 @@
cd "$(dirname "$0")" cd "$(dirname "$0")"
# Failed tests can leave dangling mounts behind. # Failed tests can leave dangling mounts behind.
for i in $(mount | grep -e "/tmp/encfs-reverse-tests-\|/tmp/encfs-tests-" | cut -f3 -d" "); do todel+=("")
for i in $(mount | grep "/tmp/encfs-tests-" | cut -f3 -d" "); do
echo "Warning: unmounting leftover filesystem: $i" echo "Warning: unmounting leftover filesystem: $i"
if which fusermount >/dev/null 2>&1
then
fusermount -u $i || true fusermount -u $i || true
else
umount -f $i || true
fi
parent=$(echo $i | grep "/tmp/encfs-tests-" | sed 's+\(/tmp/encfs-tests-[^/]*\).*+\1+')
todel+=("$parent")
done done
rm -rf ${todel[@]}
set -x set -x
# This is very noisy so run it silently at first. Run it again with # This is very noisy so run it silently at first. Run it again with
# output if the first run fails. # output if the first run fails.
./build/checkops &> /dev/null || ./build/checkops ./build/checkops >/dev/null 2>&1 || ./build/checkops
perl -MTest::Harness -e '$$Test::Harness::debug=1; runtests @ARGV;' tests/*.t.pl perl -MTest::Harness -e '$$Test::Harness::debug=1; runtests @ARGV;' tests/*.t.pl

2
tests/normal.t.pl
View File

@ -87,7 +87,7 @@ sub runTests
# Create a new empty working directory # Create a new empty working directory
sub newWorkingDir sub newWorkingDir
{ {
our $workingDir = mkdtemp("$tempDir/encfs-tests-XXXX") our $workingDir = mkdtemp("$tempDir/encfs-tests-normal-XXXX")
|| BAIL_OUT("Could not create temporary directory"); || BAIL_OUT("Could not create temporary directory");
our $raw = "$workingDir/raw"; our $raw = "$workingDir/raw";

2
tests/reverse.t.pl
View File

@ -43,7 +43,7 @@ if(system("./build/encfs --verbose --version 2>&1 | grep -q HAVE_XATTR") != 0)
# Create a new empty working directory # Create a new empty working directory
sub newWorkingDir sub newWorkingDir
{ {
our $workingDir = mkdtemp("$tempDir/encfs-reverse-tests-XXXX") our $workingDir = mkdtemp("$tempDir/encfs-tests-reverse-XXXX")
|| BAIL_OUT("Could not create temporary directory"); || BAIL_OUT("Could not create temporary directory");
our $plain = "$workingDir/plain"; our $plain = "$workingDir/plain";