2024-04-30 15:08:23

by Shengyu Li

Subject: [PATCH] selftest/tty: Use harness framework in tty

Similarly, this one is based on automated tools and a very
small percentage of manual modifications to automatically refactor
the version that uses kselftest_harness.h, which is logically clearer.

Signed-off-by: Shengyu Li <[email protected]>
---
.../testing/selftests/tty/tty_tstamp_update.c | 48 ++++++-------------
1 file changed, 14 insertions(+), 34 deletions(-)

diff --git a/tools/testing/selftests/tty/tty_tstamp_update.c b/tools/testing/selftests/tty/tty_tstamp_update.c
index 9e1a40f5db17..cdaa6a15ee65 100644
--- a/tools/testing/selftests/tty/tty_tstamp_update.c
+++ b/tools/testing/selftests/tty/tty_tstamp_update.c
@@ -9,7 +9,7 @@
#include <unistd.h>
#include <linux/limits.h>

-#include "../kselftest.h"
+#include "../kselftest_harness.h"

#define MIN_TTY_PATH_LEN 8

@@ -42,65 +42,45 @@ static int write_dev_tty(void)
return r;
}

-int main(int argc, char **argv)
+TEST(tty_tstamp_update)
{
- int r;
char tty[PATH_MAX] = {};
struct stat st1, st2;
- int result = KSFT_FAIL;

- ksft_print_header();
- ksft_set_plan(1);
-
- r = readlink("/proc/self/fd/0", tty, PATH_MAX);
- if (r < 0) {
+ ASSERT_GE(readlink("/proc/self/fd/0", tty, PATH_MAX), 0) {
ksft_print_msg("readlink on /proc/self/fd/0 failed: %m\n");
- goto out;
}

if (!tty_valid(tty)) {
- ksft_print_msg("invalid tty path '%s'\n", tty);
- result = KSFT_SKIP;
- goto out;
-
+ ksft_print_msg("SKIP: invalid tty path '%s'\n", tty);
+ exit(KSFT_SKIP);
}

- r = stat(tty, &st1);
- if (r < 0) {
+ ASSERT_GE(stat(tty, &st1), 0) {
ksft_print_msg("stat failed on tty path '%s': %m\n", tty);
- goto out;
}

/* We need to wait at least 8 seconds in order to observe timestamp change */
/* https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=fbf47635315ab308c9b58a1ea0906e711a9228de */
sleep(10);

- r = write_dev_tty();
- if (r < 0) {
- ksft_print_msg("failed to write to /dev/tty: %s\n",
- strerror(-r));
- goto out;
+ ASSERT_GE(write_dev_tty(), 0) {
+ ksft_perror("failed to write to /dev/tty");
}

- r = stat(tty, &st2);
- if (r < 0) {
+ ASSERT_GE(stat(tty, &st2), 0) {
ksft_print_msg("stat failed on tty path '%s': %m\n", tty);
- goto out;
}

/* We wrote to the terminal so timestamps should have been updated */
- if (st1.st_atim.tv_sec == st2.st_atim.tv_sec &&
- st1.st_mtim.tv_sec == st2.st_mtim.tv_sec) {
+ ASSERT_NE(st1.st_atim.tv_sec, st2.st_atim.tv_sec) {
+ ksft_print_msg("tty timestamps not updated\n");
+ }
+ ASSERT_NE(st1.st_mtim.tv_sec, st2.st_mtim.tv_sec) {
ksft_print_msg("tty timestamps not updated\n");
- goto out;
}

ksft_print_msg(
"timestamps of terminal '%s' updated after write to /dev/tty\n", tty);
- result = KSFT_PASS;
-
-out:
- ksft_test_result_report(result, "tty_tstamp_update\n");
-
- ksft_finished();
}
+TEST_HARNESS_MAIN
--
2.25.1

2024-05-03 19:42:18

by Shuah Khan

Subject: Re: [PATCH] selftest/tty: Use harness framework in tty

On 4/30/24 09:05, Shengyu Li wrote:
> Similarly, this one is based on automated tools and a very
> small percentage of manual modifications to automatically refactor
> the version that uses kselftest_harness.h, which is logically clearer.
>

Similar to what? How does refactoring help?


Follow the imperative mood to write change logs:

https://www.kernel.org/doc/html/latest/process/submitting-patches.html

> Signed-off-by: Shengyu Li <[email protected]>
> ---

thanks,
-- Shuah