diff mbox series

[v2] preadv203: set max_runtime to 60s

Message ID 20220525103336.2676073-1-liwang@redhat.com
State Accepted
Headers show
Series [v2] preadv203: set max_runtime to 60s | expand

Commit Message

Li Wang May 25, 2022, 10:33 a.m. UTC 
Before the runtime patchset preadv203 uses 5min as default timeout
per fs, that's really long enough for each test. But after that, it
now only has 30s which is too short to finish the verify_preadv2()
function that spins for at most 60 seconds.

  ==== Before =====
  # ./preadv203
  ...
  tst_test.c:1459: TINFO: Timeout per run is 0h 05m 00s
  preadv203.c:143: TINFO: Number of full_reads 2567, short reads 10, zero len reads 0, EAGAIN(s) 2530185
  preadv203.c:180: TINFO: Number of writes 682740
  preadv203.c:194: TINFO: Cache dropped 114 times
  preadv203.c:223: TPASS: Got some EAGAIN
  tst_test.c:1531: TINFO: Testing on ext3
  tst_test.c:999: TINFO: Formatting /dev/loop0 with ext3 opts='' extra opts=''
  mke2fs 1.46.5 (30-Dec-2021)
  tst_test.c:1459: TINFO: Timeout per run is 0h 05m 00s
  ...

  ==== After =====
  # ./preadv203
  tst_device.c:89: TINFO: Found free device 0 '/dev/loop0'
  tst_test.c:1524: TINFO: Timeout per run is 0h 00m 30s
  tst_supported_fs_types.c:89: TINFO: Kernel supports ext2
  ...
  tst_test.c:1597: TINFO: Testing on ext2
  tst_test.c:1062: TINFO: Formatting /dev/loop0 with ext2 opts='' extra opts=''
  mke2fs 1.46.5 (30-Dec-2021)
  Test timeouted, sending SIGKILL!
  tst_test.c:1575: TINFO: If you are running on slow machine, try exporting LTP_TIMEOUT_MUL > 1
  tst_test.c:1577: TBROK: Test killed! (timeout?)

Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
Signed-off-by: Li Wang <liwang@redhat.com>
---
 testcases/kernel/syscalls/preadv2/preadv203.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Cyril Hrubis May 25, 2022, 11:37 a.m. UTC | #1 
Hi!
Reviewed-by: Cyril Hrubis <chrubis@suse.cz>
Li Wang May 25, 2022, noon UTC | #2 
> Reviewed-by: Cyril Hrubis <chrubis@suse.cz>
>

Pushed, thanks!
diff mbox series

Patch

diff --git a/testcases/kernel/syscalls/preadv2/preadv203.c b/testcases/kernel/syscalls/preadv2/preadv203.c
index 01622ad15..60dc4a882 100644
--- a/testcases/kernel/syscalls/preadv2/preadv203.c
+++ b/testcases/kernel/syscalls/preadv2/preadv203.c
@@ -199,7 +199,6 @@  static void *cache_dropper(void *unused)
 static void verify_preadv2(void)
 {
 	pthread_t reader, dropper, writer;
-	unsigned int max_runtime = 600;
 	void *eagains;
 
 	stop = 0;
@@ -210,7 +209,7 @@  static void verify_preadv2(void)
 	SAFE_PTHREAD_CREATE(&reader, NULL, nowait_reader, NULL);
 	SAFE_PTHREAD_CREATE(&writer, NULL, writer_thread, NULL);
 
-	while (!stop && max_runtime-- > 0)
+	while (!stop && tst_remaining_runtime())
 		usleep(100000);
 
 	stop = 1;
@@ -279,5 +278,6 @@  static struct tst_test test = {
 	.mntpoint = MNTPOINT,
 	.mount_device = 1,
 	.all_filesystems = 1,
+	.max_runtime = 60,
 	.needs_root = 1,
 };