Merge branch 'develop' into next

This commit is contained in:
Sebastian Messmer 2018-02-01 11:25:04 -08:00
commit 6db124383b

View File

@ -55,16 +55,6 @@ TEST_F(ProgramOptionsParserTest, ShowCiphers) {
);
}
TEST_F(ProgramOptionsParserTest, Version) {
string expected = "CryFS Version " + gitversion::VersionString();
EXPECT_EXIT(
parse({"./myExecutable", "--version"}),
::testing::ExitedWithCode(0),
expected.c_str()
);
}
TEST_F(ProgramOptionsParserTest, BaseDir_Absolute) {
ProgramOptions options = parse({"./myExecutable", "/home/user/baseDir", "/home/user/mountDir"});
EXPECT_EQ("/home/user/baseDir", options.baseDir());