Skip to contentSkip to conversation

zram/zram_lib.sh: fix local variable assignment

PATCH New Po-Hsu Lin 2 participants 3 messages Jul 1, 2019 – Jul 2, 2019

lore
Share & tools
lore

Po-Hsu Lin

author
#0 lore raw

PATCH 1/1 zram/zram_lib.sh: fix local variable assignment

The compression algorithm was stored into a local variable "algs", however the variable name "zram_algs" was used in the for loop later.

Unify them with "zram_algs", and use sed to get rid of the square brackets that indicates the compression algorithm currently in use.

    $ cat /sys/block/zram0/comp_algorithm
    [lzo] lz4 lz4hc 842 zstd

Also, the /bin/sh was symbolically link to dash in Ubuntu. This is making the one-liner local variable assignment not working [1]:

    /opt/ltp/testcases/bin/zram01.sh: 102: local: 842: bad variable name

Break it into two lines to solve this issue.

[1] https://wiki.ubuntu.com/DashAsBinSh#local

---
 testcases/kernel/device-drivers/zram/zram_lib.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
testcases/kernel/device-drivers/zram/zram_lib.sh +5 -3
index 45116af3e..a19d03a01 100755
@@ -98,11 +98,13 @@ zram_compress_alg()
 
 	tst_resm TINFO "test that we can set compression algorithm"
 
-	local algs=$(cat /sys/block/zram0/comp_algorithm)
-	tst_resm TINFO "supported algs: $algs"
+	local zram_algs
+	zram_algs=$(sed 's/[][]//g' /sys/block/zram0/comp_algorithm)
+	tst_resm TINFO "supported algs: $zram_algs"
 	local i=0
 	for alg in $zram_algs; do
-		local sys_path="/sys/block/zram${i}/comp_algorithm"
+		local sys_path
+		sys_path="/sys/block/zram${i}/comp_algorithm"
 		echo "$alg" >  $sys_path || \
 			tst_brkm TFAIL "can't set '$alg' to $sys_path"
 		i=$(($i + 1))
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 zram/zram_lib.sh: fix local variable assignment

Hi!

Quoted 7 lines

The compression algorithm was stored into a local variable "algs", however the variable name "zram_algs" was used in the for loop later.

Unify them with "zram_algs", and use sed to get rid of the square brackets that indicates the compression algorithm currently in use.

    $ cat /sys/block/zram0/comp_algorithm
    [lzo] lz4 lz4hc 842 zstd

The test that calls the zram_compress_alg() function defines the zram_algs variable and the length must match the number of created devices in zram_load otherwise the test would fail to write to non-existing sys_path in case that there is more than 4 algorithms.

I guess that deeper changes to the test would be needed in order to be able to support testing all available compression algorithms.

Quoted 7 lines

Also, the /bin/sh was symbolically link to dash in Ubuntu. This is making the one-liner local variable assignment not working [1]:

    /opt/ltp/testcases/bin/zram01.sh: 102: local: 842: bad variable name

Break it into two lines to solve this issue.

[1] https://wiki.ubuntu.com/DashAsBinSh#local

This change is obviously correct, can you please send a patch only with this change so that it can be commited? Then we can figure something out about the compression algorithms.

Signature · 2 lines
Cyril Hrubis
[email protected]
author
#2 lore raw

PATCH 1/1 zram/zram_lib.sh: fix local variable assignment

Thanks for your feedback, I will send V2 for this.

And indeed, I just found out that the "4" devices and their properties was hard-coded in zram01.sh
That will need some fix.

Quoted 33 lines · Cyril Hrubis

Hi!

Quoted 7 lines

The compression algorithm was stored into a local variable "algs", however the variable name "zram_algs" was used in the for loop later.

Unify them with "zram_algs", and use sed to get rid of the square brackets that indicates the compression algorithm currently in use.

    $ cat /sys/block/zram0/comp_algorithm
    [lzo] lz4 lz4hc 842 zstd

The test that calls the zram_compress_alg() function defines the zram_algs variable and the length must match the number of created devices in zram_load otherwise the test would fail to write to non-existing sys_path in case that there is more than 4 algorithms.

I guess that deeper changes to the test would be needed in order to be able to support testing all available compression algorithms.

Quoted 7 lines

Also, the /bin/sh was symbolically link to dash in Ubuntu. This is making the one-liner local variable assignment not working [1]:

    /opt/ltp/testcases/bin/zram01.sh: 102: local: 842: bad variable name

Break it into two lines to solve this issue.

[1] https://wiki.ubuntu.com/DashAsBinSh#local

This change is obviously correct, can you please send a patch only with this change so that it can be commited? Then we can figure something out about the compression algorithms.

--
Cyril Hrubis
[email protected]