StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix check target files vintf test."

Browse Source
This commit is contained in:
Yifan Hong
2020-05-05 15:23:17 +00:00
committed by Gerrit Code Review
parent a2d0a60b79 975e2bef86
commit 2637f8bec7
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/releasetools/test_check_target_files_vintf.py
View File

@@ -35,20 +35,20 @@ SKELETON_TARGET_FILE_STRUCTURE = {
'SYSTEM_EXT/etc/build.prop': '', 'SYSTEM_EXT/etc/build.prop': '',
# Non-empty files # Non-empty files
'SYSTEM/compatibility_matrix.xml':""" 'SYSTEM/etc/vintf/compatibility_matrix.1.xml':"""
<compatibility-matrix version="1.0" type="framework"> <compatibility-matrix version="1.0" level="1" type="framework">
<sepolicy> <sepolicy>
<sepolicy-version>0.0</sepolicy-version> <sepolicy-version>0.0</sepolicy-version>
<kernel-sepolicy-version>0</kernel-sepolicy-version> <kernel-sepolicy-version>0</kernel-sepolicy-version>
</sepolicy> </sepolicy>
</compatibility-matrix>""", </compatibility-matrix>""",
'SYSTEM/manifest.xml': 'SYSTEM/manifest.xml':
'<manifest version="1.0" type="framework" />', '<manifest version="1.0" type="framework"/>',
'VENDOR/build.prop': 'ro.product.first_api_level=29\n', 'VENDOR/build.prop': 'ro.product.first_api_level=29\n',
'VENDOR/compatibility_matrix.xml': 'VENDOR/compatibility_matrix.xml':
'<compatibility-matrix version="1.0" type="device" />', '<compatibility-matrix version="1.0" type="device" />',
'VENDOR/manifest.xml': 'VENDOR/etc/vintf/manifest.xml':
'<manifest version="1.0" type="device"/>', '<manifest version="1.0" target-level="1" type="device"/>',
'META/misc_info.txt': 'META/misc_info.txt':
'recovery_api_version=3\nfstab_version=2\nvintf_enforce=true\n', '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): def test_CheckVintf_bad_xml(self):
test_dir = self.prepare_test_dir('does-not-exist') test_dir = self.prepare_test_dir('does-not-exist')
write_string_to_file('not an XML', 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. # Should raise an error because a file has invalid format.
self.assertRaises(common.ExternalError, CheckVintf, test_dir) self.assertRaises(common.ExternalError, CheckVintf, test_dir)

2
tools/releasetools/testdata/vintf/kernel/SYSTEM/compatibility_matrix.xml → tools/releasetools/testdata/vintf/kernel/SYSTEM/etc/vintf/compatibility_matrix.1.xml vendored
View File

@@ -1,4 +1,4 @@
<compatibility-matrix version="1.0" type="framework"> <compatibility-matrix version="1.0" level="1" type="framework">
<kernel version="4.14.1" /> <kernel version="4.14.1" />
<sepolicy> <sepolicy>
<sepolicy-version>0.0</sepolicy-version> <sepolicy-version>0.0</sepolicy-version>

2
tools/releasetools/testdata/vintf/matrix_incompat/SYSTEM/compatibility_matrix.xml → tools/releasetools/testdata/vintf/matrix_incompat/SYSTEM/etc/vintf/compatibility_matrix.1.xml vendored
View File

@@ -1,4 +1,4 @@
<compatibility-matrix version="1.0" type="framework"> <compatibility-matrix version="1.0" level="1" type="framework">
<sepolicy> <sepolicy>
<sepolicy-version>1.0</sepolicy-version> <sepolicy-version>1.0</sepolicy-version>
<kernel-sepolicy-version>0</kernel-sepolicy-version> <kernel-sepolicy-version>0</kernel-sepolicy-version>

2
tools/releasetools/testdata/vintf/sku_compat/SYSTEM/compatibility_matrix.xml → tools/releasetools/testdata/vintf/sku_compat/SYSTEM/etc/vintf/compatibility_matrix.1.xml vendored
View File

@@ -1,4 +1,4 @@
<compatibility-matrix version="1.0" type="framework"> <compatibility-matrix version="1.0" level="1" type="framework">
<hal format="hidl" optional="false"> <hal format="hidl" optional="false">
<name>foo</name> <name>foo</name>
<version>1.0</version> <version>1.0</version>

2
tools/releasetools/testdata/vintf/sku_incompat/SYSTEM/compatibility_matrix.xml → tools/releasetools/testdata/vintf/sku_incompat/SYSTEM/etc/vintf/compatibility_matrix.1.xml vendored
View File

@@ -1,4 +1,4 @@
<compatibility-matrix version="1.0" type="framework"> <compatibility-matrix version="1.0" level="1" type="framework">
<hal format="hidl" optional="false"> <hal format="hidl" optional="false">
<name>foo</name> <name>foo</name>
<version>1.1</version> <version>1.1</version>