From 9ee45ede2fe59351a5abb26b1892053a4bb7e869 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C5=81ukasz=20Stelmach?= <l.stelmach@samsung.com>
Date: Tue, 4 Jan 2022 19:27:38 +0100
Subject: [PATCH] Build and package kdbus tests
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Change-Id: I797e79acf31e4e2e88f71430d7d570069850e819
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
---
 packaging/linux-tizen-modules-source.spec | 19 +++++++++++++++++++
 tests/kdbus/Makefile                      | 11 ++++-------
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/packaging/linux-tizen-modules-source.spec b/packaging/linux-tizen-modules-source.spec
index 713de62..ba359a1 100644
--- a/packaging/linux-tizen-modules-source.spec
+++ b/packaging/linux-tizen-modules-source.spec
@@ -18,10 +18,22 @@ Group:          System/Kernel
 %description    -n linux-tizen-modules-headers
 This package exports userspace API headers for Tizen-specific kernel modules.
 
+%package        -n linux-tizen-modules-tests
+Summary:        Tizen-specific kernel modules tests
+License:        GPL-2.0+
+Group:          System/Kernel
+Provides:       linux-kernel-kdbus-tests
+BuildRequires:  pkgconfig(libcap)
+%description    -n linux-tizen-modules-tests
+This package contains tests for Tizen-specific kernel modules.
+
 %prep
 %setup -q
 cp %{SOURCE1} .
 
+%build
+make -C tests/kdbus
+
 %install
 mkdir -p %{buildroot}/usr/src/%{name}/kdbus
 mkdir -p %{buildroot}/%{_includedir}/linux
@@ -33,6 +45,8 @@ cp kernel/kdbus/*.[ch] kernel/kdbus/Makefile %{buildroot}/usr/src/%{name}/kdbus
 cp include/uapi/linux/kdbus.h %{buildroot}/%{_includedir}/linux
 cp include/uapi/linux/logger.h %{buildroot}/%{_includedir}/linux
 
+cp tests/kdbus/kdbus-test %{buildroot}/%{_libexecdir}/%{name}/tests/kdbus-test
+
 %files
 %manifest %{name}.manifest
 %license COPYING
@@ -49,3 +63,8 @@ cp include/uapi/linux/logger.h %{buildroot}/%{_includedir}/linux
 %license COPYING
 %{_includedir}/linux/kdbus.h
 %{_includedir}/linux/logger.h
+
+%files -n linux-tizen-modules-tests
+%manifest %{name}.manifest
+%license COPYING
+%{_libexecdir}/%{name}/tests/kdbus-test
diff --git a/tests/kdbus/Makefile b/tests/kdbus/Makefile
index f60619c..3d1c3fc 100644
--- a/tests/kdbus/Makefile
+++ b/tests/kdbus/Makefile
@@ -1,14 +1,12 @@
-CFLAGS += -I../../../../usr/include/
-CFLAGS += -I../../../../samples/kdbus/
+CFLAGS += -I../../include/uapi/
+CFLAGS += -I../../samples/kdbus/
 CFLAGS += -std=gnu99
 CFLAGS += -DKBUILD_MODNAME=\"kdbus\" -D_GNU_SOURCE
 LDFLAGS = -pthread -lcap -lm
 
 .PHONY: all clean
 
-include ../lib.mk
-
-TEST_CUSTOM_PROGS := $(OUTPUT)/kdbus-test
+TEST_CUSTOM_PROGS := kdbus-test
 all: $(TEST_CUSTOM_PROGS)
 
 OBJS = \
@@ -34,12 +32,11 @@ OBJS = \
 	test-policy-priv.o	\
 	test-sync.o		\
 	test-timeout.o
-OBJS := $(patsubst %,$(OUTPUT)/%,$(OBJS))
 
 $(TEST_CUSTOM_PROGS): $(OBJS)
 	$(CC) -o $(TEST_CUSTOM_PROGS) $(OBJS) $(LDFLAGS)
 
-$(OBJS): $(OUTPUT)/%.o: %.c
+$(OBJS): %.o: %.c
 	$(CC) -c $^ -o $@ $(CFLAGS)
 
 EXTRA_CLEAN := $(TEST_CUSTOM_PROGS) $(OBJS)
-- 
2.34.1