Merge tag 'trace-rv-v7.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace

b035a8be · Linus Torvalds <[email protected]> · 2026-08-26 14:47:22 -07:00

Pull runtime verification fix from Steven Rostedt:

 - Use .old instead of .bak for rvgen kunit backup files

   The rvgen kunit command generates .bak backup files and these are
   checked in for selftests as "golden" files for make check. But
   'make distclean' removes such files, leaving the tree dirty.

   Switch to .old to preserve a clean tree after make disclean.

* tag 'trace-rv-v7.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  verification/rvgen: Use .old instead of .bak for kunit backup files

Commit: b035a8be20ddfb932205beb9a1cbd80ea42e6cfb
Parents: b81e3413 · ab0304fd

Merge commit. Changes below are compared with the first parent: b81e3413.

Changes

2 files changed · +1 −1

File	Status	Add	Del	Content
tools/verification/rvgen/rvgen/kunit.py	modified	+1	−1	View file
tools/verification/rvgen/tests/golden/test_bak_kunit/test_bak_kunit_kunit.c.bak → tools/verification/rvgen/tests/golden/test_bak_kunit/test_bak_kunit_kunit.c.old	renamed	+0	−0	View file

tools/verification/rvgen/rvgen/kunit.py

View file

diff --git a/tools/verification/rvgen/rvgen/kunit.py b/tools/verification/rvgen/rvgen/kunit.py
index ed2082d..85973f9 100644
--- a/tools/verification/rvgen/rvgen/kunit.py
+++ b/tools/verification/rvgen/rvgen/kunit.py
@@ -173,7 +173,7 @@ EXPORT_SYMBOL_IF_KUNIT({struct_name});
             for path in (header_file_path, kunit_c_file_path):
                 if path.exists():
                     try:
-                        path.rename(path.with_suffix(path.suffix + ".bak"))
+                        path.rename(path.with_suffix(path.suffix + ".old"))
                     except OSError as e:
                         raise KUnitError(f"Error backing up file {path}: {e}") from e
 

tools/verification/rvgen/tests/golden/test_bak_kunit/test_bak_kunit_kunit.c.old

View file

diff --git a/tools/verification/rvgen/tests/golden/test_bak_kunit/test_bak_kunit_kunit.c.bak b/tools/verification/rvgen/tests/golden/test_bak_kunit/test_bak_kunit_kunit.c.old
similarity index 100%
rename from tools/verification/rvgen/tests/golden/test_bak_kunit/test_bak_kunit_kunit.c.bak
rename to tools/verification/rvgen/tests/golden/test_bak_kunit/test_bak_kunit_kunit.c.old