Skip to contentSkip to conversation

ext4-new-features: Fix paths to ffsb-config files

PATCH New Joerg Vehlow 2 participants 2 messages Oct 9, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ext4-new-features: Fix paths to ffsb-config files

From: Joerg Vehlow <[email protected]>

The path to the ffsb-config files was just plain wrong (they are copied to $LTPROOT/testcases/data/ext4-ffsb, but searched in cwd.
This is the same fix as in 4ae5699d, only for other tests.

---
 .../ext4-journal-checksum/ext4_journal_checksum.sh            | 2 +-
 .../ext4-uninit-groups/ext4_uninit_groups_test.sh             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
testcases/kernel/fs/ext4-new-features/ext4-journal-checksum/ext4_journal_checksum.sh +1 -1
index 9edb89397..822c94a8c 100755
@@ -69,7 +69,7 @@ ext4_test_journal_checksum()
 		return
 	fi
 
-	ffsb ffsb-config2 > /dev/null
+	ffsb $LTPROOT/testcases/data/ext4-ffsb/ffsb-config2 > /dev/null
 	if [ $? -ne 0 ]; then
 		tst_resm TFAIL "ffsb returned failure"
 		umount mnt_point
testcases/kernel/fs/ext4-new-features/ext4-uninit-groups/ext4_uninit_groups_test.sh +2 -2
index d39afae56..cf4c354d9 100755
@@ -34,13 +34,13 @@ age_filesystem()
 {
 	if [ $1 -eq $EMPTY ]; then
 		# aging, then del
-		ffsb ffsb-config3 > /dev/null
+		ffsb $LTPROOT/testcases/data/ext4-ffsb/ffsb-config3 > /dev/null
 		rm -rf mnt_point/*
 	elif [ $1 -eq $SMALL ]; then
 		# age filesystem from 0.0 to 0.2 -> 0.4 -> 0.6 -> 0.8 -> 1.0
 		for ((n = 3; n < 8; n++))
 		{
-			ffsb ffsb-config$n > /dev/null
+			ffsb $LTPROOT/testcases/data/ext4-ffsb/ffsb-config$n > /dev/null
 			mv mnt_point/data mnt_point/data$n
 		}
 	elif [ $1 -eq $LARGE ]; then
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 ext4-new-features: Fix paths to ffsb-config files

Hi Joerg,

Quoted 9 lines

The path to the ffsb-config files was just plain wrong (they are copied to $LTPROOT/testcases/data/ext4-ffsb, but searched in cwd.
This is the same fix as in 4ae5699d, only for other tests.

---
 .../ext4-journal-checksum/ext4_journal_checksum.sh            | 2 +-
 .../ext4-uninit-groups/ext4_uninit_groups_test.sh             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Thanks for your patch. ext4_online_defrag_test.sh still contains wrong path.

I'd prefer to introduce some variable in ext4_funcs.sh, e.g.:
FFSB_CONFIG_DIR="$LTPROOT/testcases/data/ext4-ffsb"

Kind regards,
Petr