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

Commit 6aa1b013 authored by Nikita Ioffe's avatar Nikita Ioffe Committed by Gerrit Code Review
Browse files

Merge changes I7a3c181a,I72c60ec8 

* changes:
  Add a test asserting that default fstab has /data entry
  Add fs_mgr_unit_test to CTS
parents a1015599 3f334dca

TEST_MAPPING

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
      "name": "debuggerd_test"

    },

    {

      "name": "fs_mgr_unit_test"

      "name": "CtsFsMgrTestCases"

    },

    {

      "name": "fs_mgr_vendor_overlay_test"

fs_mgr/tests/Android.bp

+15 −2
Original line number Diff line number Diff line
@@ -13,8 +13,21 @@ 
// limitations under the License.



cc_test {

    name: "fs_mgr_unit_test",

    test_suites: ["device-tests"],

    name: "CtsFsMgrTestCases",

    test_suites: [

        "cts",

        "device-tests",

        "vts",

    ],

    compile_multilib: "both",

    multilib: {

        lib32: {

            suffix: "32",

        },

        lib64: {

            suffix: "64",

        },

    },



    shared_libs: [

        "libbase",

fs_mgr/tests/AndroidTest.xml

0 → 100644
+28 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2019 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.

-->

<configuration description="Config for CTS fs_mgr test cases">

    <option name="test-suite-tag" value="cts" />

    <option name="config-descriptor:metadata" key="component" value="systems" />

    <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />

    <option name="config-descriptor:metadata" key="parameter" value="multi_abi" />

    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">

        <option name="cleanup" value="true" />

        <option name="push" value="CtsFsMgrTestCases->/data/local/tmp/CtsFsMgrTestCases" />

        <option name="append-bitness" value="true" />

    </target_preparer>

    <test class="com.android.tradefed.testtype.GTest" >

        <option name="native-test-device-path" value="/data/local/tmp" />

        <option name="module-name" value="CtsFsMgrTestCases" />

        <option name="runtime-hint" value="65s" />

    </test>

</configuration>

fs_mgr/tests/fs_mgr_test.cpp

+7 −0
Original line number Diff line number Diff line
@@ -962,3 +962,10 @@ source none5 swap defaults zram_backing_dev_path=/dev/path2 
    EXPECT_EQ("none5", entry->mount_point);

    EXPECT_EQ("/dev/path2", entry->zram_backing_dev_path);

}



TEST(fs_mgr, DefaultFstabContainsUserdata) {

    Fstab fstab;

    ASSERT_TRUE(ReadDefaultFstab(&fstab)) << "Failed to read default fstab";

    ASSERT_NE(nullptr, GetEntryForMountPoint(&fstab, "/data"))

            << "Default fstab doesn't contain /data entry";

}