Merge "Vts16KPageSizeTest: consistent for low RAM devices" into main
diff --git a/abi/TEST_MAPPING b/abi/TEST_MAPPING
new file mode 100644
index 0000000..7cd30de
--- /dev/null
+++ b/abi/TEST_MAPPING
@@ -0,0 +1,8 @@
+{
+ "kernel-presubmit": [
+ {
+ "name": "KernelAbilistTest"
+ }
+ ]
+}
+
diff --git a/api/sysfs/src/com/android/tests/sysfs/KernelApiSysfsTest.java b/api/sysfs/src/com/android/tests/sysfs/KernelApiSysfsTest.java
index 247356e..9dcdfa4 100644
--- a/api/sysfs/src/com/android/tests/sysfs/KernelApiSysfsTest.java
+++ b/api/sysfs/src/com/android/tests/sysfs/KernelApiSysfsTest.java
@@ -93,10 +93,10 @@
*/
@Test
public void testPerCpuCpufreq() throws Exception {
- String filePath = "/sys/devices/system/cpu/present";
+ String filePath = "/sys/devices/system/cpu/online";
assertTrue(TargetFileUtils.isReadOnly(filePath, getDevice()));
- String presentCpus = getDevice().pullFileContents(filePath).trim();
- String[] cpuRanges = presentCpus.split(",");
+ String onlineCpus = getDevice().pullFileContents(filePath).trim();
+ String[] cpuRanges = onlineCpus.split(",");
List<Integer> cpuList = new ArrayList<>();
Pattern p = Pattern.compile("(\\d+)(-\\d+)?");
for (String range : cpuRanges) {
diff --git a/encryption/file_based_encryption_tests.cpp b/encryption/file_based_encryption_tests.cpp
index 58c656d..8f28ec1 100644
--- a/encryption/file_based_encryption_tests.cpp
+++ b/encryption/file_based_encryption_tests.cpp
@@ -1274,7 +1274,11 @@
//
// Note, this test will be flaky if the kernel is missing commit 093f0bac32b
// ("f2fs: change fiemap way in printing compression chunk").
-TEST_F(FBEPolicyTest, TestF2fsCompression) {
+//
+// This test is currently disabled because the test is still flaky even with the
+// above fix, and it hasn't been able to be root-caused. TODO(b/329449658):
+// root cause the issue and re-enable the test.
+TEST_F(FBEPolicyTest, DISABLED_TestF2fsCompression) {
if (skip_test_) return;
// Currently, only f2fs supports compression+encryption.
diff --git a/ltp/testcase/tools/configs/disabled_tests.py b/ltp/testcase/tools/configs/disabled_tests.py
index ebd9915..750261b 100644
--- a/ltp/testcase/tools/configs/disabled_tests.py
+++ b/ltp/testcase/tools/configs/disabled_tests.py
@@ -95,6 +95,8 @@
'syscalls.semctl09_64bit', # b/191227035
'syscalls.setpgid02_32bit', # b/276300873
'syscalls.setpgid02_64bit', # b/276300873
+ 'syscalls.splice07_32bit', # b/328315662
+ 'syscalls.splice07_64bit', # b/328315662
'syscalls.statx07_32bit', # b/191236106
'syscalls.statx07_64bit', # b/191236106
}
diff --git a/ltp/testcase/tools/configs/stable_tests.py b/ltp/testcase/tools/configs/stable_tests.py
index 2d3c428..ef0ffff 100644
--- a/ltp/testcase/tools/configs/stable_tests.py
+++ b/ltp/testcase/tools/configs/stable_tests.py
@@ -648,6 +648,8 @@
'syscalls.abort01_64bit': False,
'syscalls.accept01_32bit': True,
'syscalls.accept01_64bit': True,
+ 'syscalls.accept03_32bit': False,
+ 'syscalls.accept03_64bit': False,
'syscalls.accept4_01_32bit': True,
'syscalls.accept4_01_64bit': True,
'syscalls.access01_32bit': True,
@@ -1054,6 +1056,8 @@
'syscalls.fchmod07_64bit': True,
'syscalls.fchmodat01_32bit': True,
'syscalls.fchmodat01_64bit': True,
+ 'syscalls.fchmodat02_32bit': True,
+ 'syscalls.fchmodat02_64bit': True,
'syscalls.fchown01_16_32bit': False,
'syscalls.fchown01_16_64bit': False,
'syscalls.fchown01_32bit': True,
@@ -1502,6 +1506,8 @@
'syscalls.getsockopt02_64bit': True,
'syscalls.gettid01_32bit': True,
'syscalls.gettid01_64bit': True,
+ 'syscalls.gettid02_32bit': True,
+ 'syscalls.gettid02_64bit': True,
'syscalls.gettimeofday01_32bit': True,
'syscalls.gettimeofday01_64bit': True,
'syscalls.gettimeofday02_32bit': True,
@@ -1622,8 +1628,6 @@
'syscalls.keyctl01_64bit': True,
'syscalls.keyctl03_32bit': True,
'syscalls.keyctl03_64bit': True,
- 'syscalls.keyctl05_32bit': True,
- 'syscalls.keyctl05_64bit': True,
'syscalls.keyctl06_32bit': True,
'syscalls.keyctl06_64bit': True,
'syscalls.kill01_32bit': True,
@@ -2042,6 +2046,8 @@
'syscalls.pipe13_64bit': True,
'syscalls.pipe14_32bit': True,
'syscalls.pipe14_64bit': True,
+ 'syscalls.pipe15_32bit': True,
+ 'syscalls.pipe15_64bit': True,
'syscalls.pipe2_01_32bit': True,
'syscalls.pipe2_01_64bit': True,
'syscalls.pipe2_02_32bit': True,
@@ -2148,6 +2154,8 @@
'syscalls.ptrace04_64bit': False,
'syscalls.ptrace05_32bit': True,
'syscalls.ptrace05_64bit': True,
+ 'syscalls.ptrace06_32bit': True,
+ 'syscalls.ptrace06_64bit': True,
'syscalls.ptrace10_32bit': False,
'syscalls.ptrace10_64bit': False,
'syscalls.ptrace11_32bit': True,
@@ -2382,6 +2390,8 @@
'syscalls.sched_setscheduler02_64bit': True,
'syscalls.sched_setscheduler03_32bit': True,
'syscalls.sched_setscheduler03_64bit': True,
+ 'syscalls.sched_setscheduler04_32bit': True,
+ 'syscalls.sched_setscheduler04_64bit': True,
'syscalls.sched_yield01_32bit': True,
'syscalls.sched_yield01_64bit': True,
'syscalls.select01_32bit': True,
@@ -2737,6 +2747,8 @@
'syscalls.splice04_64bit': True,
'syscalls.splice05_32bit': True,
'syscalls.splice05_64bit': True,
+ 'syscalls.splice06_32bit': False,
+ 'syscalls.splice06_64bit': False,
'syscalls.ssetmask01_32bit': False,
'syscalls.ssetmask01_64bit': False,
'syscalls.stat01_32bit': True,
diff --git a/ltp/testcase/tools/ltp_configs.py b/ltp/testcase/tools/ltp_configs.py
index 4f014f3..dfd22ab 100644
--- a/ltp/testcase/tools/ltp_configs.py
+++ b/ltp/testcase/tools/ltp_configs.py
@@ -83,7 +83,6 @@
'can',
'cap_bounds',
'commands',
- 'connectors',
'containers',
'controllers',
'cpuhotplug',
@@ -94,7 +93,6 @@
'fs',
'fs_bind',
'fs_perms_simple',
- 'fsx',
'hugetlb',
'hyperthreading',
'input',
@@ -117,7 +115,6 @@
'can',
'cap_bounds',
'commands',
- 'connectors',
'containers',
'cpuhotplug',
'cve',
@@ -127,7 +124,6 @@
'fs',
'fs_bind',
'fs_perms_simple',
- 'fsx',
'hugetlb',
'hyperthreading',
'input',
diff --git a/pagesize_16kb/Vts16KPageSizeTest.cpp b/pagesize_16kb/Vts16KPageSizeTest.cpp
index 0688f51..3fd74ba 100644
--- a/pagesize_16kb/Vts16KPageSizeTest.cpp
+++ b/pagesize_16kb/Vts16KPageSizeTest.cpp
@@ -63,7 +63,7 @@
if (mArch == "x86_64") {
return 4096;
} else if (mArch == "arm64" || mArch == "aarch64") {
- return 65536;
+ return 16384;
} else {
return -1;
}
@@ -86,6 +86,7 @@
ssize_t initMaxPageSize = MaxPageSize(initPath);
ASSERT_NE(initMaxPageSize, -1) << "Failed to get max page size of ELF: " << initPath;
- ASSERT_EQ(initMaxPageSize, expectedMaxPageSize)
- << "ELF " << initPath << " was not built with the required max-page-size";
+ ASSERT_EQ(initMaxPageSize % expectedMaxPageSize, 0)
+ << "ELF " << initPath << " with page size " << initMaxPageSize
+ << " was not built with the required max-page-size " << expectedMaxPageSize;
}
diff --git a/toolchain/vts_kernel_toolchain.cpp b/toolchain/vts_kernel_toolchain.cpp
index 8bffa18..bb72b3c 100644
--- a/toolchain/vts_kernel_toolchain.cpp
+++ b/toolchain/vts_kernel_toolchain.cpp
@@ -78,7 +78,7 @@
ASSERT_THAT(version_, ::testing::HasSubstr(needle));
}
-// TODO(b/303658309): Add VSR item number
+// @VsrTest = 3.4.2
TEST_F(KernelVersionTest, IsKleaf) {
constexpr uint64_t kMinAndroidRelease = 15; // Android 15
const auto kernel_release =
