extern/encfs
1
0
Fork 0
mirror of https://github.com/vgough/encfs.git synced 2024-11-21 23:43:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cygwin, update normal tests

Browse Source
This commit is contained in:
benrubson 2018-03-26 23:22:00 +02:00
parent 9495f6f7aa
commit daedfbc861
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
encfs/Error.h
View File

@ -6,6 +6,13 @@
#include "easylogging++.h" #include "easylogging++.h"
#include <stdexcept> #include <stdexcept>
// Cygwin / WinFsp does not support EBADMSG yet
// https://github.com/billziss-gh/winfsp/issues/156
#ifdef __CYGWIN__
#undef EBADMSG
#define EBADMSG EINVAL
#endif
namespace encfs { namespace encfs {
class Error : public std::runtime_error { class Error : public std::runtime_error {

30
integration/normal.t.pl
View File

@ -107,6 +107,10 @@ sub newWorkingDir
our $raw = "$workingDir/raw"; our $raw = "$workingDir/raw";
our $crypt = "$workingDir/crypt"; our $crypt = "$workingDir/crypt";
if ($^O eq "cygwin")
{
$crypt = "/cygdrive/x";
}
} }
# Test Corruption # Test Corruption
@ -124,7 +128,8 @@ sub corruption
ok( open(IN, "< $crypt/corrupt"), "open corrupted file"); ok( open(IN, "< $crypt/corrupt"), "open corrupted file");
my $content; my $content;
$result = read(IN, $content, 20); $result = read(IN, $content, 20);
ok($!{EBADMSG} && (! defined $result), "corrupted file with MAC returns read error: $!"); # Cygwin returns EINVAL for now
ok(($!{EBADMSG} || $!{EINVAL}) && (! defined $result), "corrupted file with MAC returns read error: $!");
} }
# Test internal modification # Test internal modification
@ -363,7 +368,10 @@ sub mount
# When these fail, the rest of the tests makes no sense # When these fail, the rest of the tests makes no sense
mkdir($raw) || BAIL_OUT("Could not create $raw: $!"); mkdir($raw) || BAIL_OUT("Could not create $raw: $!");
mkdir($crypt) || BAIL_OUT("Could not create $crypt: $!"); if ($^O ne "cygwin")
{
mkdir($crypt) || BAIL_OUT("Could not create $crypt: $!");
}
delete $ENV{"ENCFS6_CONFIG"}; delete $ENV{"ENCFS6_CONFIG"};
remount($args); remount($args);
@ -425,8 +433,15 @@ sub create_unmount_remount
{ {
my $crypt = "$workingDir/create_remount.crypt"; my $crypt = "$workingDir/create_remount.crypt";
my $mnt = "$workingDir/create_remount.mnt"; my $mnt = "$workingDir/create_remount.mnt";
if ($^O eq "cygwin")
{
$mnt = "/cygdrive/y";
}
mkdir($crypt) || BAIL_OUT($!); mkdir($crypt) || BAIL_OUT($!);
mkdir($mnt) || BAIL_OUT($!); if ($^O ne "cygwin")
{
mkdir($mnt) || BAIL_OUT($!);
}
system("./build/encfs --standard --extpass=\"echo test\" $crypt $mnt 2>&1"); system("./build/encfs --standard --extpass=\"echo test\" $crypt $mnt 2>&1");
ok( $? == 0, "encfs command returns 0") || return; ok( $? == 0, "encfs command returns 0") || return;
@ -472,8 +487,15 @@ sub checkWriteError
else { else {
my $crypt = "$workingDir/checkWriteError.crypt"; my $crypt = "$workingDir/checkWriteError.crypt";
my $mnt = "$workingDir/checkWriteError.mnt"; my $mnt = "$workingDir/checkWriteError.mnt";
if ($^O eq "cygwin")
{
$mnt = "/cygdrive/z";
}
mkdir($crypt) || BAIL_OUT($!); mkdir($crypt) || BAIL_OUT($!);
mkdir($mnt) || BAIL_OUT($!); if ($^O ne "cygwin")
{
mkdir($mnt) || BAIL_OUT($!);
}
system("$sudo_cmd mount -t tmpfs -o size=1m tmpfs $crypt"); system("$sudo_cmd mount -t tmpfs -o size=1m tmpfs $crypt");
ok( $? == 0, "mount command returns 0") || return; ok( $? == 0, "mount command returns 0") || return;
system("./build/encfs --standard --extpass=\"echo test\" $crypt $mnt 2>&1"); system("./build/encfs --standard --extpass=\"echo test\" $crypt $mnt 2>&1");