tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes I70c174c4,Ifc365e3b am: 1f92dc1a07 am: 086e31510d

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1760905

Change-Id: I467f47e71d01e4f5769338e73a477982ec066aad
This commit is contained in:
Treehugger Robot 2021-07-08 21:55:02 +00:00 committed by Automerger Merge Worker
commit 3f457fcda4
2 changed files with 54 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs_mgr/libsnapshot/cow_writer.cpp
View file

@ -58,8 +58,8 @@ bool ICowWriter::AddRawBlocks(uint64_t new_block_start, const void* data, size_t
return EmitRawBlocks(new_block_start, data, size);
}
bool AddXorBlocks(uint32_t /*new_block_start*/, const void* /*data*/, size_t /*size*/,
uint32_t /*old_block*/, uint16_t /*offset*/) {
bool ICowWriter::AddXorBlocks(uint32_t /*new_block_start*/, const void* /*data*/, size_t /*size*/,
uint32_t /*old_block*/, uint16_t /*offset*/) {
LOG(ERROR) << "AddXorBlocks not yet implemented";
return false;
}

52
fs_mgr/libsnapshot/include/libsnapshot/mock_snapshot_writer.h Normal file
View file

@ -0,0 +1,52 @@
//
// Copyright (C) 2021 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
#include <gmock/gmock.h>
#include <libsnapshot/snapshot_writer.h>
namespace android::snapshot {
class MockSnapshotWriter : public ISnapshotWriter {
public:
using FileDescriptor = ISnapshotWriter::FileDescriptor;
explicit MockSnapshotWriter(const CowOptions& options) : ISnapshotWriter(options) {}
MockSnapshotWriter() : ISnapshotWriter({}) {}
MOCK_METHOD(bool, Finalize, (), (override));
// Return number of bytes the cow image occupies on disk.
MOCK_METHOD(uint64_t, GetCowSize, (), (override));
// Returns true if AddCopy() operations are supported.
MOCK_METHOD(bool, SupportsCopyOperation, (), (const override));
MOCK_METHOD(bool, EmitCopy, (uint64_t, uint64_t), (override));
MOCK_METHOD(bool, EmitRawBlocks, (uint64_t, const void*, size_t), (override));
MOCK_METHOD(bool, EmitZeroBlocks, (uint64_t, uint64_t), (override));
MOCK_METHOD(bool, EmitLabel, (uint64_t), (override));
MOCK_METHOD(bool, EmitSequenceData, (size_t, const uint32_t*), (override));
// Open the writer in write mode (no append).
MOCK_METHOD(bool, Initialize, (), (override));
// Open the writer in append mode, with the last label to resume
// from. See CowWriter::InitializeAppend.
MOCK_METHOD(bool, InitializeAppend, (uint64_t label), (override));
MOCK_METHOD(std::unique_ptr<FileDescriptor>, OpenReader, (), (override));
};
} // namespace android::snapshot