From 6ada5166e9ee9d557479e9e3170966f8dd14aa05 Mon Sep 17 00:00:00 2001 From: Sebastian Messmer Date: Sat, 8 Sep 2018 04:29:28 -0700 Subject: [PATCH] Fix CliTest regex checks in unit tests on Windows --- test/cryfs-cli/testutils/CliTest.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/cryfs-cli/testutils/CliTest.h b/test/cryfs-cli/testutils/CliTest.h index 70499e8c..24df1ade 100644 --- a/test/cryfs-cli/testutils/CliTest.h +++ b/test/cryfs-cli/testutils/CliTest.h @@ -56,14 +56,14 @@ public: } void EXPECT_EXIT_WITH_HELP_MESSAGE(const std::vector& args, const std::string &message, cryfs::ErrorCode errorCode) { - EXPECT_RUN_ERROR(args, (".*Usage:.*"+message).c_str(), errorCode); + EXPECT_RUN_ERROR(args, "Usage:[^\\x00]*"+message, errorCode); } - void EXPECT_RUN_ERROR(const std::vector& args, const char* message, cryfs::ErrorCode errorCode) { + void EXPECT_RUN_ERROR(const std::vector& args, const std::string& message, cryfs::ErrorCode errorCode) { FilesystemOutput filesystem_output = _run_filesystem(args, boost::none); EXPECT_EQ(exitCode(errorCode), filesystem_output.exit_code); - EXPECT_TRUE(std::regex_search(filesystem_output.stderr_, std::regex(message, std::regex::basic))); + EXPECT_TRUE(std::regex_search(filesystem_output.stderr_, std::regex(message))); } void EXPECT_RUN_SUCCESS(const std::vector& args, const boost::filesystem::path &mountDir) {