Snap for 6553159 from 6e43f7af616a2dd5701bccb2c7e0829ff537436a to rvc-releaseandroid-vts-11.0_r1android-security-11.0.0_r76android-security-11.0.0_r75android-security-11.0.0_r74android-security-11.0.0_r73android-security-11.0.0_r72android-security-11.0.0_r71android-security-11.0.0_r70android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53android-security-11.0.0_r52android-security-11.0.0_r51android-security-11.0.0_r50android-security-11.0.0_r49android-security-11.0.0_r1android-r-beta-3android-r-beta-2android-cts-11.0_r1android-11.0.0_r5android-11.0.0_r4android-11.0.0_r3android-11.0.0_r25android-11.0.0_r2android-11.0.0_r17android-11.0.0_r1r-beta-2android11-security-releaseandroid11-s1-releaseandroid11-release

Change-Id: I0171d8043ff520f85be313118bc22811e2d23aae

1 files changed, 34 insertions, 20 deletions

diff --git a/android/README.md b/android/README.md
index 93ea3fdc7032..2c94e05b4cdf 100644
--- a/android/README.md
+++ b/android/README.md
@@ -34,38 +34,44 @@ directories/files:
 * `external/linux-kselftest/android/kselftest_test_list.mk`: Lists all tests that will get pulled into VTS - VTS depends on this list.
 * `external/linux-kselftest/android/README`: Lists details on why particular tests are not enabled in Android.
 * `external/linux-kselftest/tools/testing/selftests`: Kselftest sources.
-* `test/vts-testcase/kernel/linux_kselftest/kselftest_config.py`: Lists the tests included in the staging and stable VTS kselftest suites (VtsKernelLinuxKselftest, VtsKernelLinuxKselftestStaging). If a test is not listed here then it will not be run by VTS.
+* `test/vts-testcase/kernel/linux_kselftest/testcases/`: tests to run in VTS kselftest suites are
+specified in each of the test XML file, e.g, vts_linux_kselftest_arm_32.xml contains tests for 32 bit ARM platform.
 
-To run VTS kselftest it must first be built. VTS is not device specific, you
-need not compile it specifically for the device you wish to run it on, assuming
+Running Kselftest through atest
+-------------------------------
+You can run Kselftest tests with atest, which handles all the setup and build steps.
+
+To run all 32 bit Kselftest tests:
+* `atest vts_linux_kselftest_arm`
+
+To run all 64 bit Kselftest tests:
+* `atest vts_linux_kselftest_arm_64`
+
+To run a single test:
+* `atest vts_linux_kselftest_arm_64:timers_valid-adjtimex_arm_64`
+
+Running Kselftest through VTS
+-----------------------------
+To run VTS kselftest through VTS, it must first be built. VTS is not device specific,
+you need not compile it specifically for the device you wish to run it on, assuming
 it is the same architecture.
 * `. build/envsetup.sh`
 * `lunch`
 * `make -j vts`
 
-Before running VTS ensure your host has the required prerequisites (this need
-only be done once):
-* `. test/vts/script/setup.sh`
-
-Then open vts-tradefed and run the VTS stable set:
+Then open vts-tradefed and run the VTS tests (64 bit ARM platform as an example):
 * `vts-tradefed`
-* `vts-tf > run vts-kernel -m VtsKernelLinuxKselftest`
+* `vts-tf > run vts-kernel -m vts_linux_kselftest_arm_64`
 
 If you regularly work with multiple devices it may be useful to specify the
 specific device you wish to run VTS on via the serial number:
-* `vts-tf > run vts-kernel -m VtsKernelLinuxKselftest -s 000123456789`
+* `vts-tf > run vts-kernel -m vts_linux_kselftest_arm_64 -s 000123456789`
 
-Or we can run the staging set:
-* `vts-tf > run vts-kernel -m VtsKernelLinuxKselftestStaging`
+Or a specific test:
+* `vts-tf > run vts-kernel -m vts_linux_kselftest_arm_64 -t net_socket`
 
-Or a specific test within the stable set:
-* `vts-tf > run vts-kernel -m VtsKernelLinuxKselftest -t net_socket`
-
-Maybe several:
-* `vts-tf > run vts-kernel -m VtsKernelLinuxKselftest -t net_socket,timers_posix_timers`
-
-Running Kselftest Faster
-------------------------
+Running Kselftest Directly
+--------------------------
 
 Running kselftest tests within VTS can be quite cumbersome, especially if you
 are iterating a lot trying to debug something. Build and run kselftest tests
@@ -96,6 +102,10 @@ destabilize your box or cause data loss. If you need to run tests on an x86
 platform and are unsure if they are safe you should run them in emulation, in a
 virtualized environment, or on a dedicated development x86 platform.
 
+To run Kselftest tests for x86 platform, you can do:
+* `atest vts_linux_kselftest_x86`
+* `atest vts_linux_kselftest_x86_64`
+
 Sending Fixes Upstream
 ----------------------
 
@@ -144,6 +154,10 @@ To merge in a new upstream version of kselftest:
 4. Test on all supported kernel versions, ensuring that any tests currently enabled in VTS do not generate new failures.
 5. Commit the merge.
 
+If the runtime of kselftest changes significantly be sure to update the runtime-hint and test-timeout parameters to VTS in
+test config files under
+`test/vts-testcase/kernel/linux_kselftest/testcases/`.
+
 Notes on Individual Tests
 -------------------------