Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db68e061 authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

Merge "libfiemap: Ignore userdata requirements in fiemap_writer_test when... 

Merge "libfiemap: Ignore userdata requirements in fiemap_writer_test when running a DSU." into rvc-dev am: 0d246eb9 am: 1a7bb7d7 am: 765aef83

Change-Id: I933c79e389b1db6466e6211d234f0b6afc0c5566
parents 06239dea 765aef83

fs_mgr/libfiemap/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ cc_test { 
        "libdm",

        "libfs_mgr",

        "liblog",

        "libgsi",

    ],



    data: [

fs_mgr/libfiemap/fiemap_writer_test.cpp

+5 −1
Original line number Diff line number Diff line
@@ -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,8 +149,11 @@ 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));



    if (!android::gsi::IsGsiRunning()) {

        EXPECT_EQ(fptr->bdev_path().find("/dev/block/dm-"), string::npos);

    }

}



TEST_F(FiemapWriterTest, CheckFileCreated) {

    FiemapUniquePtr fptr = FiemapWriter::Open(testfile, 32768);