diff options
| author | Daniel Rosenberg <drosen@google.com> | 2020-06-18 20:23:59 -0700 |
|---|---|---|
| committer | Daniel Rosenberg <drosen@google.com> | 2020-06-18 20:41:25 -0700 |
| commit | b83133219c40597089d3d0dc359f25e03a8bd390 (patch) | |
| tree | 67a01ce5a1a917798b38bf207ae629d119090e52 | |
| parent | 17ebe7b55cd44860e439c42adb20d86924579a04 (diff) | |
| download | platform_test_vts-testcase_kernel-b83133219c40597089d3d0dc359f25e03a8bd390.tar.gz platform_test_vts-testcase_kernel-b83133219c40597089d3d0dc359f25e03a8bd390.tar.bz2 platform_test_vts-testcase_kernel-b83133219c40597089d3d0dc359f25e03a8bd390.zip | |
Only test Sdcardfs isn't used for kernel 5.4+
Bug: 159393723
Test: atest SdcardfsTest with pre and post 5.4 kernel
Change-Id: Iba7671d4c9be7e655b2bfc39e603ad808ac5f5a4
| -rw-r--r-- | sdcardfs/src/com/android/sdcardfs/vts/SdcardfsTest.java | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/sdcardfs/src/com/android/sdcardfs/vts/SdcardfsTest.java b/sdcardfs/src/com/android/sdcardfs/vts/SdcardfsTest.java index 7b43d580..9834be11 100644 --- a/sdcardfs/src/com/android/sdcardfs/vts/SdcardfsTest.java +++ b/sdcardfs/src/com/android/sdcardfs/vts/SdcardfsTest.java @@ -20,6 +20,9 @@ import static org.junit.Assert.fail; import com.android.tradefed.log.LogUtil.CLog; import com.android.tradefed.testtype.DeviceJUnit4ClassRunner; import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test; +import com.android.tradefed.util.CommandResult; +import com.android.tradefed.util.CommandStatus; +import java.util.Scanner; import org.junit.Test; import org.junit.runner.RunWith; @@ -27,8 +30,26 @@ import org.junit.runner.RunWith; public final class SdcardfsTest extends BaseHostJUnit4Test { public static final String TAG = SdcardfsTest.class.getSimpleName(); + private static final int MIN_KERNEL_MAJOR = 5; + private static final int MIN_KERNEL_MINOR = 4; + + private boolean should_run(String str) { + Scanner versionScanner = new Scanner(str).useDelimiter("\\."); + int major = versionScanner.nextInt(); + int minor = versionScanner.nextInt(); + if (major > MIN_KERNEL_MAJOR) + return true; + if (major < MIN_KERNEL_MAJOR) + return false; + return minor >= MIN_KERNEL_MINOR; + } + @Test public void testSdcardfsNotPresent() throws Exception { + CommandResult result = getDevice().executeShellV2Command("uname -r"); + assertEquals(result.getStatus(), CommandStatus.SUCCESS); + if (!should_run(result.getStdout())) + return; String cmd = "mount | grep \"type sdcardfs\""; CLog.i("Invoke shell command [" + cmd + "]"); try { |
