rust-for-linux.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] kselftest: Add basic test for probing the rust sample modules
@ 2024-02-22 15:10 Laura Nao
  2024-02-22 15:53 ` Valentin Obst
  0 siblings, 1 reply; 3+ messages in thread
From: Laura Nao @ 2024-02-22 15:10 UTC (permalink / raw)
  To: ojeda, alex.gaynor, wedsonaf, shuah
  Cc: usama.anjum, a.hindborg, aliceryhl, benno.lossin, bjorn3_gh,
	boqun.feng, gary, kernel, laura.nao, linux-kernel,
	linux-kselftest, rust-for-linux, Sergio Gonzalez Collado

Add new basic kselftest that checks if the available rust sample modules
can be added and removed correctly.

Signed-off-by: Laura Nao <laura.nao@collabora.com>
Reviewed-by: Sergio Gonzalez Collado <sergio.collado@gmail.com>
Reviewed-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
---
Changes in v2:
- Added missing SPDX line
- Edited test_probe_samples.sh script to use the common KTAP helpers file
---
 MAINTAINERS                                   |  1 +
 tools/testing/selftests/Makefile              |  1 +
 tools/testing/selftests/rust/Makefile         |  4 ++
 .../selftests/rust/test_probe_samples.sh      | 42 +++++++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 100644 tools/testing/selftests/rust/Makefile
 create mode 100755 tools/testing/selftests/rust/test_probe_samples.sh

diff --git a/MAINTAINERS b/MAINTAINERS
index c1a18af3593a..5f62904c80bd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -19207,6 +19207,7 @@ F:	Documentation/rust/
 F:	rust/
 F:	samples/rust/
 F:	scripts/*rust*
+F:	tools/testing/selftests/rust/
 K:	\b(?i:rust)\b
 
 RXRPC SOCKETS (AF_RXRPC)
diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile
index f7255969b695..e1504833654d 100644
--- a/tools/testing/selftests/Makefile
+++ b/tools/testing/selftests/Makefile
@@ -80,6 +80,7 @@ TARGETS += riscv
 TARGETS += rlimits
 TARGETS += rseq
 TARGETS += rtc
+TARGETS += rust
 TARGETS += seccomp
 TARGETS += sgx
 TARGETS += sigaltstack
diff --git a/tools/testing/selftests/rust/Makefile b/tools/testing/selftests/rust/Makefile
new file mode 100644
index 000000000000..fce1584d3bc0
--- /dev/null
+++ b/tools/testing/selftests/rust/Makefile
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
+TEST_PROGS += test_probe_samples.sh
+
+include ../lib.mk
diff --git a/tools/testing/selftests/rust/test_probe_samples.sh b/tools/testing/selftests/rust/test_probe_samples.sh
new file mode 100755
index 000000000000..6fcc2cd83d89
--- /dev/null
+++ b/tools/testing/selftests/rust/test_probe_samples.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
+#
+# Copyright (c) 2023 Collabora Ltd
+#
+# This script tests whether the rust sample modules can
+# be added and removed correctly.
+#
+
+DIR="$(dirname "$(readlink -f "$0")")"
+
+source "${DIR}"/../kselftest/ktap_helpers.sh
+
+rust_sample_modules=("rust_minimal" "rust_print")
+
+KSFT_PASS=0
+KSFT_FAIL=1
+KSFT_SKIP=4
+
+ret="${KSFT_PASS}"
+
+ktap_print_header
+
+ktap_set_plan "${#rust_sample_modules[@]}"
+
+for sample in "${rust_sample_modules[@]}"; do
+    if ! /sbin/modprobe -n -q "$sample"; then
+        ktap_test_skip "module $sample is not found in /lib/modules/$(uname -r)"
+        continue
+    fi
+
+    if /sbin/modprobe -q "$sample"; then
+        /sbin/modprobe -q -r "$sample"
+        ktap_test_pass "$sample"
+    else
+        ret="${KSFT_FAIL}"
+        ktap_test_fail "$sample"
+    fi
+done
+
+ktap_print_totals
+exit "${ret}"
-- 
2.30.2


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH v2] kselftest: Add basic test for probing the rust sample modules
  2024-02-22 15:10 [PATCH v2] kselftest: Add basic test for probing the rust sample modules Laura Nao
@ 2024-02-22 15:53 ` Valentin Obst
  2024-02-22 16:37   ` Laura Nao
  0 siblings, 1 reply; 3+ messages in thread
From: Valentin Obst @ 2024-02-22 15:53 UTC (permalink / raw)
  To: laura.nao
  Cc: a.hindborg, alex.gaynor, aliceryhl, benno.lossin, bjorn3_gh,
	boqun.feng, gary, kernel, linux-kernel, linux-kselftest, ojeda,
	rust-for-linux, sergio.collado, shuah, usama.anjum, wedsonaf,
	Valentin Obst

> diff --git a/tools/testing/selftests/rust/test_probe_samples.sh b/tools/testing/selftests/rust/test_probe_samples.sh
> new file mode 100755
> index 000000000000..6fcc2cd83d89
> --- /dev/null
> +++ b/tools/testing/selftests/rust/test_probe_samples.sh
> @@ -0,0 +1,42 @@
> +#!/bin/bash
> +# SPDX-License-Identifier: GPL-2.0
> +#
> +# Copyright (c) 2023 Collabora Ltd
> +#
> +# This script tests whether the rust sample modules can
> +# be added and removed correctly.
> +#
> +
> +DIR="$(dirname "$(readlink -f "$0")")"
> +
> +source "${DIR}"/../kselftest/ktap_helpers.sh
> +
> +rust_sample_modules=("rust_minimal" "rust_print")
> +
> +KSFT_PASS=0
> +KSFT_FAIL=1
> +KSFT_SKIP=4

Aren't those constants now defined in `ktap_helpers.sh` as well, i.e.,
could those be removed here?

    - Best Valentin

> +
> +ret="${KSFT_PASS}"
> +
> +ktap_print_header
> +
> +ktap_set_plan "${#rust_sample_modules[@]}"
> +
> +for sample in "${rust_sample_modules[@]}"; do
> +    if ! /sbin/modprobe -n -q "$sample"; then
> +        ktap_test_skip "module $sample is not found in /lib/modules/$(uname -r)"
> +        continue
> +    fi
> +
> +    if /sbin/modprobe -q "$sample"; then
> +        /sbin/modprobe -q -r "$sample"
> +        ktap_test_pass "$sample"
> +    else
> +        ret="${KSFT_FAIL}"
> +        ktap_test_fail "$sample"
> +    fi
> +done
> +
> +ktap_print_totals
> +exit "${ret}"

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v2] kselftest: Add basic test for probing the rust sample modules
  2024-02-22 15:53 ` Valentin Obst
@ 2024-02-22 16:37   ` Laura Nao
  0 siblings, 0 replies; 3+ messages in thread
From: Laura Nao @ 2024-02-22 16:37 UTC (permalink / raw)
  To: kernel
  Cc: a.hindborg, alex.gaynor, aliceryhl, benno.lossin, bjorn3_gh,
	boqun.feng, gary, kernel, laura.nao, linux-kernel,
	linux-kselftest, ojeda, rust-for-linux, sergio.collado, shuah,
	usama.anjum, wedsonaf

On 2/22/24 16:53, Valentin Obst wrote:
> 
> Aren't those constants now defined in `ktap_helpers.sh` as well, i.e.,
> could those be removed here?
> 
>      - Best Valentin
> 

Definitely, I forgot to remove them. Thanks for the heads up!

I also noticed there's a ktap_finished function now available that
prints the results summary and handles the return code, so the test
script can be simplified further.

v3 includes these changes: https://lore.kernel.org/linux-kselftest/20240222162913.498197-1-laura.nao@collabora.com/T/#u

Best

Laura

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2024-02-22 16:36 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-22 15:10 [PATCH v2] kselftest: Add basic test for probing the rust sample modules Laura Nao
2024-02-22 15:53 ` Valentin Obst
2024-02-22 16:37   ` Laura Nao

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).