Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41d4b0b3 authored by Edward Liaw's avatar Edward Liaw Committed by Gerrit Code Review
Browse files

Merge "linux-kselftest: Remove special cased build rule for kselftest" into main

parents 624b0f4b ba282927

core/config.mk

+1 −2
Original line number Diff line number Diff line
@@ -1303,9 +1303,8 @@ include $(BUILD_SYSTEM)/ninja_config.mk 
include $(BUILD_SYSTEM)/soong_config.mk

endif



-include external/linux-kselftest/android/kselftest_test_list.mk

-include external/ltp/android/ltp_package_list.mk

DEFAULT_DATA_OUT_MODULES := ltp $(ltp_packages) $(kselftest_modules)

DEFAULT_DATA_OUT_MODULES := ltp $(ltp_packages)

.KATI_READONLY := DEFAULT_DATA_OUT_MODULES



include $(BUILD_SYSTEM)/dumpvar.mk

core/tasks/general-tests.mk

+1 −10
Original line number Diff line number Diff line
@@ -44,22 +44,14 @@ general_tests_host_shared_libs_zip := $(PRODUCT_OUT)/general-tests_host-shared-l 
include $(BUILD_SYSTEM)/tasks/tools/vts-kernel-tests.mk

ltp_copy_pairs := \

  $(call target-native-copy-pairs,$(kernel_ltp_modules),$(kernel_ltp_host_out))

kselftest_copy_pairs := \

  $(call target-native-copy-pairs,$(kernel_kselftest_modules),$(kernel_kselftest_host_out))

copy_ltp_tests := $(call copy-many-files,$(ltp_copy_pairs))

copy_kselftest_tests := $(call copy-many-files,$(kselftest_copy_pairs))



# PHONY target to be used to build and test `vts_ltp_tests` and `vts_kselftest_tests` without building full vts

# PHONY target to be used to build and test `vts_ltp_tests` without building full vts

.PHONY: vts_kernel_ltp_tests

vts_kernel_ltp_tests: $(copy_ltp_tests)



.PHONY: vts_kernel_kselftest_tests

vts_kernel_kselftest_tests: $(copy_kselftest_tests)



$(general_tests_zip) : $(copy_ltp_tests)

$(general_tests_zip) : $(copy_kselftest_tests)

$(general_tests_zip) : PRIVATE_KERNEL_LTP_HOST_OUT := $(kernel_ltp_host_out)

$(general_tests_zip) : PRIVATE_KERNEL_KSELFTEST_HOST_OUT := $(kernel_kselftest_host_out)

$(general_tests_zip) : PRIVATE_general_tests_list_zip := $(general_tests_list_zip)

$(general_tests_zip) : .KATI_IMPLICIT_OUTPUTS := $(general_tests_list_zip) $(general_tests_configs_zip) $(general_tests_host_shared_libs_zip)

$(general_tests_zip) : PRIVATE_TOOLS := $(general_tests_tools)
@@ -73,7 +65,6 @@ $(general_tests_zip) : $(COMPATIBILITY.general-tests.FILES) $(general_tests_tool 
	mkdir -p $(PRIVATE_INTERMEDIATES_DIR) $(PRIVATE_INTERMEDIATES_DIR)/tools

	echo $(sort $(COMPATIBILITY.general-tests.FILES)) | tr " " "\n" > $(PRIVATE_INTERMEDIATES_DIR)/list

	find $(PRIVATE_KERNEL_LTP_HOST_OUT) >> $(PRIVATE_INTERMEDIATES_DIR)/list

	find $(PRIVATE_KERNEL_KSELFTEST_HOST_OUT) >> $(PRIVATE_INTERMEDIATES_DIR)/list

	grep $(HOST_OUT_TESTCASES) $(PRIVATE_INTERMEDIATES_DIR)/list > $(PRIVATE_INTERMEDIATES_DIR)/host.list || true

	grep $(TARGET_OUT_TESTCASES) $(PRIVATE_INTERMEDIATES_DIR)/list > $(PRIVATE_INTERMEDIATES_DIR)/target.list || true

	grep -e .*\\.config$$ $(PRIVATE_INTERMEDIATES_DIR)/host.list > $(PRIVATE_INTERMEDIATES_DIR)/host-test-configs.list || true

core/tasks/tools/vts-kernel-tests.mk

+0 −5
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
# 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



include $(BUILD_SYSTEM)/tasks/tools/vts_package_utils.mk
@@ -23,7 +22,3 @@ kernel_ltp_vts_out := $(HOST_OUT)/$(test_suite_name)/android-$(test_suite_name)/ 
kernel_ltp_modules := \

    ltp \

    $(ltp_packages)
 


kernel_kselftest_host_out := $(HOST_OUT_TESTCASES)/vts_kernel_kselftest_tests

kernel_kselftest_vts_out := $(HOST_OUT)/$(test_suite_name)/android-$(test_suite_name)/testcases/vts_kernel_kselftest_tests

kernel_kselftest_modules := $(kselftest_modules)

core/tasks/vts-core-tests.mk

+1 −4
Original line number Diff line number Diff line
@@ -20,13 +20,10 @@ include $(BUILD_SYSTEM)/tasks/tools/vts-kernel-tests.mk 


ltp_copy_pairs := \

  $(call target-native-copy-pairs,$(kernel_ltp_modules),$(kernel_ltp_vts_out))

kselftest_copy_pairs := \

  $(call target-native-copy-pairs,$(kernel_kselftest_modules),$(kernel_kselftest_vts_out))



copy_ltp_tests := $(call copy-many-files,$(ltp_copy_pairs))

copy_kselftest_tests := $(call copy-many-files,$(kselftest_copy_pairs))



test_suite_extra_deps := $(copy_ltp_tests) $(copy_kselftest_tests)

test_suite_extra_deps := $(copy_ltp_tests)



include $(BUILD_SYSTEM)/tasks/tools/compatibility.mk