summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorweifang.liu <weifang.liu@amlogic.com>2023-01-25 18:43:46 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-01-25 18:43:46 +0000
commit176da4763ed5b4a8f74a431fe6b9f27c8f114692 (patch)
tree3d6c07f65817fa3952106cf66d693e6429096cf3
parentefc4863cd6e6c71dd8937e19765836426d943a0b (diff)
parent9f21306d82809056d38c8ad87edd3bc251859dce (diff)
downloadkernel-176da4763ed5b4a8f74a431fe6b9f27c8f114692.tar.gz
vts: KernelApiSysfsTest com.android.tests.sysfs.KernelApiSysfsTest#testKfenceSampleRate fail on 32bit kernel [1/1] am: 9f21306d82
Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/kernel/+/2308427 Change-Id: I38df564990f0f1eb207e024ee64fcb4096d3f32e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--api/sysfs/src/com/android/tests/sysfs/KernelApiSysfsTest.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/api/sysfs/src/com/android/tests/sysfs/KernelApiSysfsTest.java b/api/sysfs/src/com/android/tests/sysfs/KernelApiSysfsTest.java
index 105560aa..35de7b30 100644
--- a/api/sysfs/src/com/android/tests/sysfs/KernelApiSysfsTest.java
+++ b/api/sysfs/src/com/android/tests/sysfs/KernelApiSysfsTest.java
@@ -27,6 +27,7 @@ import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
import com.android.tradefed.util.FileUtil;
import com.android.tradefed.util.TargetFileUtils;
import com.android.tradefed.util.TargetFileUtils.FilePermission;
+import com.android.tradefed.log.LogUtil.CLog;
import com.google.common.base.Strings;
import java.util.ArrayList;
import java.util.Arrays;
@@ -282,6 +283,17 @@ public class KernelApiSysfsTest extends BaseHostJUnit4Test {
if ((kernel_major < 5) || ((kernel_major == 5) && (kernel_minor < 10)))
return;
+ String executeShellKernelARM64 =
+ "cat /proc/config.gz | gzip -d | grep CONFIG_ARM64=y";
+
+ boolean isKernelARM64 = getDevice().executeShellCommand(executeShellKernelARM64)
+ .contains("CONFIG_ARM64");
+
+ if (!isKernelARM64) {
+ CLog.d("Kernel not 64bit skip");
+ return;
+ }
+
String filePath = "/sys/module/kfence/parameters/sample_interval";
assertTrue("Failed readwrite check of " + filePath,
TargetFileUtils.isReadWriteOnly(filePath, getDevice()));