Skip to contentSkip to conversation

tests: fix r_move_itable_realloc to run on Linux

PATCH Applied Andreas Dilger 2 participants 2 messages Jan 10, 2023 – Mar 17, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests: fix r_move_itable_realloc to run on Linux

The check for the various unsupported OSes incorrectly checked if the string "FreeBSD" was true, which it always was. Fix this.

Update the expect file as commit v1.46.4-17-g4ea80d031c7e did to adjust the total number of blocks requested during resize.

Change-Id I272dbec67ab30bac6413eb4cba0e3ab00183b893
Fixes 5a3ea3905f ("tests: force test file systems to be built for Linux OS")
---
 tests/r_move_itable_realloc/expect | 2 +-
 tests/r_move_itable_realloc/script | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
tests/r_move_itable_realloc/expect +1 -1
index 67f2fe4a8a6b..8ce56dbc07dd 100644
@@ -1,6 +1,6 @@
 mke2fs -q -F -o Linux -b 1024 -i 1024 -O ^resize_inode -t ext4 test.img 1024000
 resize2fs -p test.img 100000000
-Resizing the filesystem on test.img to 100000000 (1k) blocks.
+Resizing the filesystem on test.img to 99999745 (1k) blocks.
 Begin pass 2 (max = 2061)
 Relocating blocks             ----------------------------------------XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 Begin pass 3 (max = 125)
tests/r_move_itable_realloc/script +1 -1
index 20c26dbd9a9c..49f8d58a2783 100644
@@ -1,5 +1,5 @@
 os=$(uname -s)
-if [ "$os" = "Darwin" -o "$os" = "GNU" -o "FreeBSD" ]; then
+if [ "$os" = "Darwin" -o "$os" = "GNU" -o "$os" = "FreeBSD" ]; then
 	# creates a 96GB filesystem
 	echo "$test_name: $test_description: skipped: skipped for $os"
 	return 0
Signature · 1 line
1.8.3.1
#1 lore raw
Quoted 8 lines · Andreas Dilger

The check for the various unsupported OSes incorrectly checked if the string "FreeBSD" was true, which it always was. Fix this.

Update the expect file as commit v1.46.4-17-g4ea80d031c7e did to adjust the total number of blocks requested during resize.

[...]

Applied, thanks!

[1/1] tests: fix r_move_itable_realloc to run on Linux

      commit: 516d53a42d4ffa79b31f8190530b7ac184d71b06

Best regards,

Signature · 1 line
Theodore Ts'o <[email protected]>