diff options
| author | 2020-05-19 22:25:44 +0000 | |
|---|---|---|
| committer | 2020-05-19 22:25:44 +0000 | |
| commit | e47836b0c66d412c220fb0e95f68215533f9ba1f (patch) | |
| tree | fb146e388d870cf95c2fd9c82e3c89fff8d45c93 | |
| parent | 2fc5a393e0c04b7d069fd1b1dfb69dbd79abfdb8 (diff) | |
| parent | a1082fb0465a27021d78c4ef9e59051145f82460 (diff) | |
Merge "Revert "Add vts related artifacts to vts-core package"" into rvc-dev
| -rw-r--r-- | core/tasks/vts-core-tests.mk | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/core/tasks/vts-core-tests.mk b/core/tasks/vts-core-tests.mk index 4e83de5974..a3247da343 100644 --- a/core/tasks/vts-core-tests.mk +++ b/core/tasks/vts-core-tests.mk @@ -12,15 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. +-include external/linux-kselftest/android/kselftest_test_list.mk +-include external/ltp/android/ltp_package_list.mk + test_suite_name := vts test_suite_tradefed := vts-tradefed test_suite_readme := test/vts/tools/vts-core-tradefed/README -# TODO(b/149249068): Clean up after all VTS tests are converted. -vts_test_artifact_paths := -# Some repo may not include vts project. --include test/vts/tools/build/tasks/framework/vts_for_core_suite.mk - # Copy kernel test modules to testcases directories kernel_test_host_out := $(HOST_OUT_TESTCASES)/vts_kernel_tests kernel_test_vts_out := $(HOST_OUT)/$(test_suite_name)/android-$(test_suite_name)/testcases/vts_kernel_tests @@ -44,7 +42,6 @@ include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk $(compatibility_zip): $(copy_kernel_tests) .PHONY: vts -$(compatibility_zip): $(vts_test_artifact_paths) vts: $(compatibility_zip) $(call dist-for-goals, vts, $(compatibility_zip)) |