Merge "libfiemap: Ignore userdata requirements in fiemap_writer_test when running a DSU."
This commit is contained in:
commit
b954b13613
2 changed files with 6 additions and 1 deletions
|
@ -69,6 +69,7 @@ cc_test {
|
|||
"libdm",
|
||||
"libfs_mgr",
|
||||
"liblog",
|
||||
"libgsi",
|
||||
],
|
||||
|
||||
data: [
|
||||
|
|
|
@ -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) {
|
||||
|
|
Loading…
Reference in a new issue