openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "libfiemap: Ignore userdata requirements in fiemap_writer_test when running a DSU." into rvc-dev am: 0d246eb96a am: 1a7bb7d724 am: 765aef838b 

Change-Id: I933c79e389b1db6466e6211d234f0b6afc0c5566
This commit is contained in:
David Anderson 2020-05-01 18:28:30 +00:00 committed by Automerger Merge Worker
parent 06239deafe 765aef838b
commit db68e061dc
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",
"libfs_mgr",
"liblog",
"libgsi",
],
data: [

6
fs_mgr/libfiemap/fiemap_writer_test.cpp
View File

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