Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix reverse tests on OSX, improve install documentation #51

Merged
merged 6 commits into from
Jan 18, 2015
Merged

Fix reverse tests on OSX, improve install documentation #51

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b05872d
tests: Use portable_unmount in reverse tests
rfjakob Dec 30, 2014
6b411e6
INSTALL.md: Convert to markdown and expand
rfjakob Jan 11, 2015
49527fc
Update ax_boost_base.m4 to fix build failure on Ubuntu 14.04 x86_64
rfjakob Jan 12, 2015
bc4f38f
configure.ac: Error out if pkg-config is missing
rfjakob Jan 13, 2015
d494d18
encfs manpage: Document ENCFS6_CONFIG
rfjakob Jan 13, 2015
fce6d72
README.md: Add link to the man page
rfjakob Jan 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
tests: Use portable_unmount in reverse tests 
Fixes unmount failure on OSX
  • Loading branch information
@rfjakob
rfjakob committed Jan 11, 2015
commit b05872d85d8350eade04f1d593c9c3fefdd39ee9
13 changes: 13 additions & 0 deletions tests/common.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
# Portable FUSE unmount
# works on Linux AND OSX
sub portable_unmount {
my $crypt = shift;
my $fusermount = qx(which fusermount);
chomp($fusermount);
if(-f $fusermount) {
qx($fusermount -u "$crypt");
} else {
qx(umount "$crypt");
}
}

# Helper function
# Get the MD5 sum of the file open at the filehandle
use Digest::MD5 qw(md5_hex);
Expand Down
10 changes: 1 addition & 9 deletions tests/normal.t.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,15 +316,7 @@ sub mount
# Unmount and delete mountpoint
sub cleanup
{
my $fusermount = qx(which fusermount);
chomp($fusermount);
if(-f $fusermount)
{
qx($fusermount -u "$crypt");
} else
{
qx(umount "$crypt");
}
portable_unmount($crypt);

rmdir $crypt;
ok( ! -d $crypt, "unmount ok, mount point removed");
Expand Down
4 changes: 2 additions & 2 deletions tests/reverse.t.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ sub newWorkingDir
# Unmount and delete mountpoint
sub cleanup
{
system("fusermount -u $decrypted");
system("fusermount -u $ciphertext");
portable_unmount($decrypted);
portable_unmount($ciphertext);
our $workingDir;
rmtree($workingDir);
ok( ! -d $workingDir, "working dir removed");
Expand Down