Fix: Add kernel configuration for lttng clock plugin

Only one lttng clock plugin can be used when building the lttng-modules
in the kernel. To make it possible to use a custom clock plugin it must
be possible to unconfigure the test clock plugin

Signed-off-by: Anders Wallin <wallinux@gmail.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/Kconfig b/Kconfig
index 6b4ad68308c1cb3735765e91bbafb51163bb4a54..c350b9b61a65de70f0b077a9dabf96f24972e77d 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -10,3 +10,5 @@ config LTTNG
          the Linux kernel image, choose Y.
 
          If unsure, say N.
+
+source "lttng/tests/Kconfig"

diff --git a/Makefile b/Makefile
index c2b12132dab6fa69ded50b4ae91be0d9252d2a7d..8602649a0d3b3890e30920c8437003e9a3fb82e0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -107,15 +107,15 @@ CFLAGS = $(EXTCFLAGS)
 default: modules
 
 modules:
-       $(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m modules
+       $(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m modules
 
 modules_install:
-       $(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m modules_install
+       $(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m modules_install
 
 clean:
        $(MAKE) -C $(KERNELDIR) M=$(PWD) clean
 
 %.i: %.c
-       $(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m $@
+       $(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m $@
 
 endif # KERNELRELEASE

diff --git a/tests/Kbuild b/tests/Kbuild
index 5e49007abc0d41eb95441be4aaec2fde67c8b571..aabb8e206ed076d4b77d326de0f8c3b51b82eff2 100644 (file)
--- a/tests/Kbuild
+++ b/tests/Kbuild
@@ -7,7 +7,7 @@ ccflags-y += -I$(TOP_LTTNG_MODULES_DIR)
 obj-$(CONFIG_LTTNG) += lttng-test.o
 lttng-test-objs := probes/lttng-test.o
 
-obj-$(CONFIG_LTTNG) += lttng-clock-plugin-test.o
+obj-$(CONFIG_LTTNG_CLOCK_PLUGIN_TEST) += lttng-clock-plugin-test.o
 lttng-clock-plugin-test-objs := clock-plugin/lttng-clock-plugin-test.o
 
 # vim:syntax=make

diff --git a/tests/Kconfig b/tests/Kconfig
new file mode 100644 (file)
index 0000000..65e0a2b
--- /dev/null
+++ b/tests/Kconfig
@@ -0,0 +1,8 @@
+config LTTNG_CLOCK_PLUGIN_TEST
+       tristate "Use test plugin as trace clock"
+       depends on LTTNG
+       help
+        Use the test clock as trace clock. This plugin freezes the
+        time with 1 KHz for regression test.
+        It's recommended to build this as a module to work with the
+        lttng-tools test suite.