[6.12.y,42/60] rust: error: check for config `test` in `Error::name`

Commit Message

Miguel Ojeda March 7, 2025, 10:49 p.m. UTC

From: Danilo Krummrich <[e-mail]>

commit 4a28ab469ff01855eb819dfd94754d1792f03f2a upstream.

Additional to `testlib` also check for `test` in `Error::name`. This is
required by a subsequent patch that (indirectly) uses `Error` in test
cases.

Reviewed-by: Alice Ryhl <[e-mail]>
Reviewed-by: Benno Lossin <[e-mail]>
Reviewed-by: Gary Guo <[e-mail]>
Signed-off-by: Danilo Krummrich <[e-mail]>
Link: https://lore.kernel.org/r/[e-mail]
Signed-off-by: Miguel Ojeda <[e-mail]>
---
 rust/kernel/error.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/rust/kernel/error.rs b/rust/kernel/error.rs
index aced2fe68b86..7cd3bbab52f2 100644
--- a/rust/kernel/error.rs
+++ b/rust/kernel/error.rs
@@ -161,7 +161,7 @@  pub fn to_ptr<T>(self) -> *mut T {
     }
 
     /// Returns a string representing the error, if one exists.
-    #[cfg(not(testlib))]
+    #[cfg(not(any(test, testlib)))]
     pub fn name(&self) -> Option<&'static CStr> {
         // SAFETY: Just an FFI call, there are no extra safety requirements.
         let ptr = unsafe { bindings::errname(-self.0.get()) };
@@ -178,7 +178,7 @@  pub fn name(&self) -> Option<&'static CStr> {
     /// When `testlib` is configured, this always returns `None` to avoid the dependency on a
     /// kernel function so that tests that use this (e.g., by calling [`Result::unwrap`]) can still
     /// run in userspace.
-    #[cfg(testlib)]
+    #[cfg(any(test, testlib))]
     pub fn name(&self) -> Option<&'static CStr> {
         None
     }