hardcoresushi
/
libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix CI build

This commit is contained in:
Sebastian Messmer 2017-11-04 19:03:04 +00:00
parent 5fe3cada4c
commit 19e3433035
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@ -49,7 +49,7 @@ references:
sudo chmod o-w /etc/apt/sources.list.d/clang.list
DEBIAN_FRONTEND=noninteractive sudo apt-get update -qq
DEBIAN_FRONTEND=noninteractive sudo apt-get install -y git ccache $APT_COMPILER_PACKAGE cmake make libcurl4-openssl-dev libcrypto++-dev libssl-dev libfuse-dev python
DEBIAN_FRONTEND=noninteractive sudo apt-get install -y git ccache $APT_COMPILER_PACKAGE cmake make libcurl4-openssl-dev libcrypto++-dev libssl-dev libfuse-dev python clang-tidy
# Use /dev/urandom when /dev/random is accessed to use less entropy
sudo cp -a /dev/urandom /dev/random

10
test/cpp-utils/EitherTest.cpp
View File

@ -49,22 +49,22 @@ public:
void EXPECT_LEFT_IS(const Expected &expected, either<Left, Right> &value) {
EXPECT_IS_LEFT(value);
EXPECT_EQ(expected, value.left());
EXPECT_EQ(expected, value.left_opt().value());
EXPECT_EQ(expected, value.left_opt().get());
EXPECT_EQ(boost::none, value.right_opt());
const either<Left, Right> &const_value = value;
EXPECT_EQ(expected, const_value.left());
EXPECT_EQ(expected, const_value.left_opt().value());
EXPECT_EQ(expected, const_value.left_opt().get());
EXPECT_EQ(boost::none, const_value.right_opt());
}
template<class Left, class Right, class Expected>
void EXPECT_RIGHT_IS(const Expected &expected, either<Left, Right> &value) {
EXPECT_IS_RIGHT(value);
EXPECT_EQ(expected, value.right());
EXPECT_EQ(expected, value.right_opt().value());
EXPECT_EQ(expected, value.right_opt().get());
EXPECT_EQ(boost::none, value.left_opt());
const either<Left, Right> &const_value = value;
EXPECT_EQ(expected, const_value.right());
EXPECT_EQ(expected, const_value.right_opt().value());
EXPECT_EQ(expected, const_value.right_opt().get());
EXPECT_EQ(boost::none, const_value.left_opt());
}
};
@ -244,7 +244,7 @@ TEST_F(EitherTest, ModifyRight) {
TEST_F(EitherTest, ModifyLeftOpt) {
either<string, int> val = string("mystring1");
val.left_opt().value() = "mystring2";
val.left_opt().get() = "mystring2";
EXPECT_LEFT_IS("mystring2", val);
}