module/delete_module/Makefile: make some fixes to conform to module compile in kernel 2.6 series and higher
testcases/kernel/Makefile: make it include module test Signed-off-by: Xiaoguang Wang <[email protected]> --- scenario_groups/default | 1 + testcases/kernel/Makefile | 1 + testcases/kernel/module/delete_module/Makefile | 35 ++++++++------------------ 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/scenario_groups/default b/scenario_groups/default index 9eca8ad..ff23c7c 100644 --- a/scenario_groups/default +++ b/scenario_groups/default @@ -25,3 +25,4 @@ hugetlb commands hyperthreading kernel_misc +modules diff --git a/testcases/kernel/Makefile b/testcases/kernel/Makefile index fa6a191..6bffe79 100644 --- a/testcases/kernel/Makefile +++ b/testcases/kernel/Makefile @@ -53,6 +53,7 @@ SUBDIRS += connectors \ security \ timers \ tracing \ + module \ ifeq ($(WITH_POWER_MANAGEMENT_TESTSUITE),yes) SUBDIRS += power_management diff --git a/testcases/kernel/module/delete_module/Makefile b/testcases/kernel/module/delete_module/Makefile index 83b1648..95693b1 100644 --- a/testcases/kernel/module/delete_module/Makefile +++ b/testcases/kernel/module/delete_module/Makefile @@ -18,36 +18,23 @@ # description : make file for the delete_module(2) testcases # ########################################################################### -top_srcdir ?= ../../../.. - -include $(top_srcdir)/include/mk/testcases.mk - -CFLAGS += -D_GNU_SOURCE +ifneq ($(KERNELRELEASE),) -LOCALVERSION ?= $(shell uname -r) +obj-m := dummy_del_mod.o dummy_del_mod_dep.o -MODULEDIR := $(DESTDIR)/lib/modules/$(LOCALVERSION)/build +else -# KBuild make variables... -MODCFLAGS += $(MODULEDIR) +top_srcdir ?= ../../../.. -export EXTRA_CFLAGS := $(CFLAGS) -export EXTRA_CPPFLAGS := $(CPPFLAGS) -export EXTRA_LDFLAGS := $(LDFLAGS) +include $(top_srcdir)/include/mk/testcases.mk -obj-m := dummy_del_mod.o dummy_del_mod_dep.o -MODULES := dummy_del_mod.ko dummy_del_mod_dep.ko +REQ_VERSION_MAJOR := 2 +REQ_VERSION_PATCH := 6 -# New make infra variables... -CLEAN_TARGETS := .dummy* *.mod.c .tmp_version *.ko -INSTALL_TARGETS := $(MODULES) -MAKE_TARGETS := delete_module01 delete_module02 delete_module03 +MAKE_TARGETS := delete_module01 delete_module02 delete_module03 \ + dummy_del_mod.ko dummy_del_mod_dep.ko +include $(top_srcdir)/include/mk/module.mk include $(top_srcdir)/include/mk/generic_leaf_target.mk -$(MAKE_TARGETS): | make-module - -# KBuild will gripe because we redefine CFLAGS if KBUILD_NOPEDANTIC isn't set. -.PHONY: make-module -make-module: - make -C $(MODULEDIR) KBUILD_NOPEDANTIC=1 SUBDIRS=$(abs_srcdir) modules +endif -- 1.8.2.1 ------------------------------------------------------------------------------ Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
