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

Commit 2637f8be authored by Yifan Hong's avatar Yifan Hong Committed by Gerrit Code Review
Browse files

Merge "Fix check target files vintf test."

parents a2d0a60b 975e2bef

tools/releasetools/test_check_target_files_vintf.py

+6 −6
Original line number Diff line number Diff line
@@ -35,8 +35,8 @@ SKELETON_TARGET_FILE_STRUCTURE = { 
    'SYSTEM_EXT/etc/build.prop': '',



    # Non-empty files

    'SYSTEM/compatibility_matrix.xml':"""

        <compatibility-matrix version="1.0" type="framework">

    'SYSTEM/etc/vintf/compatibility_matrix.1.xml':"""

        <compatibility-matrix version="1.0" level="1" type="framework">

            <sepolicy>

                <sepolicy-version>0.0</sepolicy-version>

                <kernel-sepolicy-version>0</kernel-sepolicy-version>
@@ -47,8 +47,8 @@ SKELETON_TARGET_FILE_STRUCTURE = { 
    'VENDOR/build.prop': 'ro.product.first_api_level=29\n',

    'VENDOR/compatibility_matrix.xml':

        '<compatibility-matrix version="1.0" type="device" />',

    'VENDOR/manifest.xml':

        '<manifest version="1.0" type="device"/>',

    'VENDOR/etc/vintf/manifest.xml':

        '<manifest version="1.0" target-level="1" type="device"/>',

    'META/misc_info.txt':

        'recovery_api_version=3\nfstab_version=2\nvintf_enforce=true\n',

}
@@ -140,6 +140,6 @@ class CheckTargetFilesVintfTest(test_utils.ReleaseToolsTestCase): 
  def test_CheckVintf_bad_xml(self):

    test_dir = self.prepare_test_dir('does-not-exist')

    write_string_to_file('not an XML',

                         os.path.join(test_dir, 'VENDOR/manifest.xml'))

                         os.path.join(test_dir, 'VENDOR/etc/vintf/manifest.xml'))

    # Should raise an error because a file has invalid format.

    self.assertRaises(common.ExternalError, CheckVintf, test_dir)

tools/releasetools/testdata/vintf/kernel/SYSTEM/compatibility_matrix.xml→tools/releasetools/testdata/vintf/kernel/SYSTEM/etc/vintf/compatibility_matrix.1.xml

+1 −1
Original line number Diff line number Diff line 
<compatibility-matrix version="1.0" type="framework">

<compatibility-matrix version="1.0" level="1" type="framework">

    <kernel version="4.14.1" />

    <sepolicy>

        <sepolicy-version>0.0</sepolicy-version>

tools/releasetools/testdata/vintf/matrix_incompat/SYSTEM/compatibility_matrix.xml→tools/releasetools/testdata/vintf/matrix_incompat/SYSTEM/etc/vintf/compatibility_matrix.1.xml

+1 −1
Original line number Diff line number Diff line 
<compatibility-matrix version="1.0" type="framework">

<compatibility-matrix version="1.0" level="1" type="framework">

    <sepolicy>

        <sepolicy-version>1.0</sepolicy-version>

        <kernel-sepolicy-version>0</kernel-sepolicy-version>

tools/releasetools/testdata/vintf/sku_compat/SYSTEM/compatibility_matrix.xml→tools/releasetools/testdata/vintf/sku_compat/SYSTEM/etc/vintf/compatibility_matrix.1.xml

+1 −1
Original line number Diff line number Diff line 
<compatibility-matrix version="1.0" type="framework">

<compatibility-matrix version="1.0" level="1" type="framework">

    <hal format="hidl" optional="false">

        <name>foo</name>

        <version>1.0</version>

tools/releasetools/testdata/vintf/sku_incompat/SYSTEM/compatibility_matrix.xml→tools/releasetools/testdata/vintf/sku_incompat/SYSTEM/etc/vintf/compatibility_matrix.1.xml

+1 −1
Original line number Diff line number Diff line 
<compatibility-matrix version="1.0" type="framework">

<compatibility-matrix version="1.0" level="1" type="framework">

    <hal format="hidl" optional="false">

        <name>foo</name>

        <version>1.1</version>