From 7d1f8cec25000e97877817045d95d9cbc4fcb510 Mon Sep 17 00:00:00 2001 From: Dan Shi Date: Thu, 23 Apr 2020 16:21:05 -0700 Subject: [PATCH] [VTS] copy ltp and kselftest to testcase folder Bug: 154446791 Test: m -j vts_kernel_tests vts Change-Id: I405c227293085d3fd0603e9eba5ce276d7dc14d5 --- core/tasks/vts-core-tests.mk | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/core/tasks/vts-core-tests.mk b/core/tasks/vts-core-tests.mk index 08663c24cd..4e83de5974 100644 --- a/core/tasks/vts-core-tests.mk +++ b/core/tasks/vts-core-tests.mk @@ -21,8 +21,28 @@ 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 +kernel_test_modules := \ + $(kselftest_modules) \ + ltp \ + $(ltp_packages) + +kernel_test_copy_pairs := \ + $(call target-native-copy-pairs,$(kernel_test_modules),$(kernel_test_vts_out)) \ + $(call target-native-copy-pairs,$(kernel_test_modules),$(kernel_test_host_out)) + +copy_kernel_tests := $(call copy-many-files,$(kernel_test_copy_pairs)) + +# PHONY target to be used to build and test `vts_kernel_tests` without building full vts +.PHONY: vts_kernel_tests +vts_kernel_tests: $(copy_kernel_tests) + include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk +$(compatibility_zip): $(copy_kernel_tests) + .PHONY: vts $(compatibility_zip): $(vts_test_artifact_paths) vts: $(compatibility_zip)