ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "libfiemap: Ignore userdata requirements in fiemap_writer_test when running a DSU." into rvc-dev

Browse source
This commit is contained in:
David Anderson 2020-05-01 17:46:02 +00:00 • committed by Android (Google) Code Review
commit 0d246eb96a
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
fs_mgr/libfiemap/Android.bp
View file

@ -68,6 +68,7 @@ cc_test {
"libdm", "libdm",
"libfs_mgr", "libfs_mgr",
"liblog", "liblog",
"libgsi",
], ],
data: [ data: [

6
fs_mgr/libfiemap/fiemap_writer_test.cpp
View file

@ -35,6 +35,7 @@
#include <libdm/loop_control.h> #include <libdm/loop_control.h>
#include <libfiemap/fiemap_writer.h> #include <libfiemap/fiemap_writer.h>
#include <libfiemap/split_fiemap_writer.h> #include <libfiemap/split_fiemap_writer.h>
#include <libgsi/libgsi.h>
#include "utility.h" #include "utility.h"
@ -148,7 +149,10 @@ TEST_F(FiemapWriterTest, CheckBlockDevicePath) {
FiemapUniquePtr fptr = FiemapWriter::Open(testfile, gBlockSize); FiemapUniquePtr fptr = FiemapWriter::Open(testfile, gBlockSize);
EXPECT_EQ(fptr->size(), gBlockSize); EXPECT_EQ(fptr->size(), gBlockSize);
EXPECT_EQ(fptr->bdev_path().find("/dev/block/"), size_t(0)); EXPECT_EQ(fptr->bdev_path().find("/dev/block/"), size_t(0));
EXPECT_EQ(fptr->bdev_path().find("/dev/block/dm-"), string::npos);
if (!android::gsi::IsGsiRunning()) {
EXPECT_EQ(fptr->bdev_path().find("/dev/block/dm-"), string::npos);
}
} }
TEST_F(FiemapWriterTest, CheckFileCreated) { TEST_F(FiemapWriterTest, CheckFileCreated) {