diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-06-22 06:01:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-06-22 06:01:53 +0000 |
| commit | fe51496019c12cc66902f8e3f04b6530c534cdcf (patch) | |
| tree | 1f6c28dc731772a29ea3c341e84ff2f8e8aecea2 | |
| parent | 679a62f5d3e946fe142279d5214415d9474b8f4c (diff) | |
| parent | 3660723fefe1c550e81e49a820bbea9bd06eeca6 (diff) | |
| download | platform_test_vts-testcase_kernel-oreo-dev.tar.gz platform_test_vts-testcase_kernel-oreo-dev.tar.bz2 platform_test_vts-testcase_kernel-oreo-dev.zip | |
Merge "Skip ProcMmapRndCompatBitsTest if kernel is 32-bit" into oc-devoreo-dev
| -rw-r--r-- | api/proc/KernelProcFileApiTest.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/api/proc/KernelProcFileApiTest.py b/api/proc/KernelProcFileApiTest.py index d5d1cd3f..7a111851 100644 --- a/api/proc/KernelProcFileApiTest.py +++ b/api/proc/KernelProcFileApiTest.py @@ -50,7 +50,6 @@ TEST_OBJECTS = { ProcMemInfoTest.ProcMemInfoTest(), ProcSimpleFileTests.ProcMmapMinAddrTest(), ProcSimpleFileTests.ProcMmapRndBitsTest(), - ProcSimpleFileTests.ProcMmapRndCompatBitsTest(), ProcModulesTest.ProcModulesTest(), ProcMountsTest.ProcMountsTest(), ProcSimpleFileTests.ProcOverCommitMemoryTest(), @@ -64,6 +63,10 @@ TEST_OBJECTS = { ProcZoneInfoTest.ProcZoneInfoTest(), } +TEST_OBJECTS_64 = { + ProcSimpleFileTests.ProcMmapRndCompatBitsTest(), +} + class KernelProcFileApiTest(base_test.BaseTestClass): """Test cases which check content of proc files.""" @@ -80,6 +83,8 @@ class KernelProcFileApiTest(base_test.BaseTestClass): Args: test_object: inherits KernelProcFileTestBase, contains the test functions """ + asserts.skipIf(test_object in TEST_OBJECTS_64 and not self.dut.is64Bit, + "Skip test for 64-bit kernel.") filepath = test_object.get_path() file_utils.assertPermissionsAndExistence( self.shell, filepath, test_object.get_permission_checker()) @@ -104,7 +109,7 @@ class KernelProcFileApiTest(base_test.BaseTestClass): """Run all proc file tests.""" self.runGeneratedTests( test_func=self.runProcFileTest, - settings=TEST_OBJECTS, + settings=TEST_OBJECTS.union(TEST_OBJECTS_64), name_func=lambda test_obj: "test" + test_obj.__class__.__name__) def ReadFileContent(self, filepath): |