From: Andrea Cervesato <andrea.cervesato@suse.de>
To: Linux Test Project <ltp@lists.linux.it>
Subject: [LTP] [PATCH v6 3/4] fw_load: merge module and test into fw_load folder
Date: Thu, 11 Jun 2026 15:44:21 +0200 [thread overview]
Message-ID: <20260611-fw_load-v6-3-c2aec79a7ed7@suse.com> (raw)
In-Reply-To: <20260611-fw_load-v6-0-c2aec79a7ed7@suse.com>
From: Andrea Cervesato <andrea.cervesato@suse.com>
Rename fw_load test into fw_load01 and move it into the fw_load folder
within ltp_fw_load.ko module.
Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.com>
---
runtest/kernel_misc | 2 +-
testcases/kernel/firmware/{fw_load_kernel => fw_load}/.gitignore | 1 +
testcases/kernel/firmware/{fw_load_kernel => fw_load}/Makefile | 8 +++++---
testcases/kernel/firmware/{fw_load_user => fw_load}/fw_load.h | 0
.../firmware/{fw_load_user/fw_load.c => fw_load/fw_load01.c} | 0
.../kernel/firmware/{fw_load_kernel => fw_load}/ltp_fw_load.c | 0
testcases/kernel/firmware/fw_load_user/.gitignore | 1 -
testcases/kernel/firmware/fw_load_user/Makefile | 8 --------
8 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/runtest/kernel_misc b/runtest/kernel_misc
index 78f00d305fea10367fb4fd2845f25dd151a833ea..19caee1d81da9cf0503088138ecfda13436b96cf 100644
--- a/runtest/kernel_misc
+++ b/runtest/kernel_misc
@@ -1,6 +1,6 @@
cn_pec_sh cn_pec.sh
kmsg01 kmsg01
-fw_load fw_load
+fw_load01 fw_load01
rtc01 rtc01
rtc02 rtc02
block_dev block_dev
diff --git a/testcases/kernel/firmware/fw_load_kernel/.gitignore b/testcases/kernel/firmware/fw_load/.gitignore
similarity index 91%
rename from testcases/kernel/firmware/fw_load_kernel/.gitignore
rename to testcases/kernel/firmware/fw_load/.gitignore
index 6fc82952c7f5406c04195e1064375d0c2bd53909..57eca444c161e6ba642561664cc7de3a8f134841 100644
--- a/testcases/kernel/firmware/fw_load_kernel/.gitignore
+++ b/testcases/kernel/firmware/fw_load/.gitignore
@@ -5,3 +5,4 @@
/ltp_fw_load.mod.c
/.tmp_versions/
modules.livepatch
+fw_load01
diff --git a/testcases/kernel/firmware/fw_load_kernel/Makefile b/testcases/kernel/firmware/fw_load/Makefile
similarity index 82%
rename from testcases/kernel/firmware/fw_load_kernel/Makefile
rename to testcases/kernel/firmware/fw_load/Makefile
index e81b300faaa6b4056d4b5f3d1417c381a000256d..91e8d8d153b43c459a899aff2124db612ec9e960 100644
--- a/testcases/kernel/firmware/fw_load_kernel/Makefile
+++ b/testcases/kernel/firmware/fw_load/Makefile
@@ -1,6 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (c) 2013 Oracle and/or its affiliates. All Rights Reserved.
# Copyright (c) Linux Test Project, 2026
-# SPDX-License-Identifier: GPL-2.0-or-later
ifneq ($(KERNELRELEASE),)
@@ -11,11 +11,13 @@ endif
else
top_srcdir ?= ../../../..
-include $(top_srcdir)/include/mk/env_pre.mk
+
+include $(top_srcdir)/include/mk/testcases.mk
REQ_VERSION_MAJOR := 3
REQ_VERSION_PATCH := 7
-MAKE_TARGETS := ltp_fw_load.ko
+
+MAKE_TARGETS := fw_load01 ltp_fw_load.ko
include $(top_srcdir)/include/mk/module.mk
include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/firmware/fw_load_user/fw_load.h b/testcases/kernel/firmware/fw_load/fw_load.h
similarity index 100%
rename from testcases/kernel/firmware/fw_load_user/fw_load.h
rename to testcases/kernel/firmware/fw_load/fw_load.h
diff --git a/testcases/kernel/firmware/fw_load_user/fw_load.c b/testcases/kernel/firmware/fw_load/fw_load01.c
similarity index 100%
rename from testcases/kernel/firmware/fw_load_user/fw_load.c
rename to testcases/kernel/firmware/fw_load/fw_load01.c
diff --git a/testcases/kernel/firmware/fw_load_kernel/ltp_fw_load.c b/testcases/kernel/firmware/fw_load/ltp_fw_load.c
similarity index 100%
rename from testcases/kernel/firmware/fw_load_kernel/ltp_fw_load.c
rename to testcases/kernel/firmware/fw_load/ltp_fw_load.c
diff --git a/testcases/kernel/firmware/fw_load_user/.gitignore b/testcases/kernel/firmware/fw_load_user/.gitignore
deleted file mode 100644
index 1d0814980660f34b64bd49ba16c25dc1d99e9d07..0000000000000000000000000000000000000000
--- a/testcases/kernel/firmware/fw_load_user/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/fw_load
diff --git a/testcases/kernel/firmware/fw_load_user/Makefile b/testcases/kernel/firmware/fw_load_user/Makefile
deleted file mode 100644
index 5b031e2eb81597689ff5eab70246fb20ad02e77d..0000000000000000000000000000000000000000
--- a/testcases/kernel/firmware/fw_load_user/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (c) 2013 Oracle and/or its affiliates. All Rights Reserved.
-# Copyright (c) Linux Test Project, 2026
-
-top_srcdir ?= ../../../..
-
-include $(top_srcdir)/include/mk/testcases.mk
-include $(top_srcdir)/include/mk/generic_leaf_target.mk
--
2.51.0
--
Mailing list info: https://lists.linux.it/listinfo/ltp
next prev parent reply other threads:[~2026-06-11 13:45 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-11 13:44 [LTP] [PATCH v6 0/4] Rewrite fw_load test using new API Andrea Cervesato
2026-06-11 13:44 ` [LTP] [PATCH v6 1/4] fw_load: Modernize ltp_fw_load kernel module Andrea Cervesato
2026-06-11 14:44 ` [LTP] " linuxtestproject.agent
2026-06-15 11:03 ` [LTP] [PATCH v6 1/4] " Cyril Hrubis
2026-06-11 13:44 ` [LTP] [PATCH v6 2/4] fw_load: rewrite test using new LTP API Andrea Cervesato
2026-06-15 11:33 ` Cyril Hrubis
2026-06-15 11:50 ` Andrea Cervesato via ltp
2026-06-11 13:44 ` Andrea Cervesato [this message]
2026-06-11 13:44 ` [LTP] [PATCH v6 4/4] fw_load: add fw_load02 for custom firmware path Andrea Cervesato
2026-06-15 11:49 ` Cyril Hrubis
2026-06-15 12:01 ` Andrea Cervesato via ltp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260611-fw_load-v6-3-c2aec79a7ed7@suse.com \
--to=andrea.cervesato@suse.de \
--cc=ltp@lists.linux.it \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.