resolve merging issues. #57
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
b-maldoca
reviewed
Jul 27, 2021
maldoca/base/testing/test_utils.h
Outdated
| @@ -22,6 +22,7 @@ | |||
| #include "maldoca/base/file.h" | |||
| #include "maldoca/base/get_runfiles_dir.h" | |||
|
|
|||
|
|
|||
maldoca/ole/dir_test.cc
Outdated
| @@ -69,9 +69,11 @@ TEST(OLEDirectoryEntryTest, BasicTest) { | |||
| EXPECT_TRUE(entry.IsInitialized()); | |||
|
|
|||
| // Can't initialize twice. | |||
| ASSERT_DEATH(entry.Initialize("foo", DirectoryStorageType::Storage, 1, 2, 3, | |||
| ASSERT_DEATH(entry.Initialize("foo", DirectoryStorageType::Storage, 1, 2, 3, | |||
| @@ -94,8 +96,12 @@ void ValidateParsedProto(absl::string_view file_base, absl::string_view ext, | |||
| const ProcessorConfig& config) { | |||
| std::string input_file_name = absl::StrCat(file_base, ".", ext); | |||
| std::string input; | |||
| <<<<<<< HEAD | |||
There was a problem hiding this comment.
seems there r some merge issues, no?
b-maldoca
reviewed
Jul 27, 2021
maldoca/ole/dir_test.cc
Outdated
| @@ -72,6 +72,8 @@ TEST(OLEDirectoryEntryTest, BasicTest) { | |||
| ASSERT_DEATH(entry.Initialize("foo", DirectoryStorageType::Storage, 1, 2, 3, | |||
| 4, 5, 6, clsid, 8, 9, 10), | |||
| "Check failed: !is_initialized_"); | |||
| /*entry.Initialize("foo", DirectoryStorageType::Storage, 1, 2, 3, 4, 5, 6, | |||
b-maldoca
reviewed
Jul 27, 2021
b-maldoca
approved these changes
Jul 27, 2021
dtao-oss
force-pushed
the
dtao_win32_1
branch
4 times, most recently
from
92a0410
to
65a406c
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.