[PATCH] seltests/zram: fix syntax error

[PATCH] seltests/zram: fix syntax error

[Zhang Zhen]

Not all shells define a variable UID. This is a bash and zsh feature only.
In other shells, the UID variable is not defined, so here test command
expands to [ != 0 ] which is a syntax error.

Without this patch:
root@HGH1000007090:/opt/work/linux/tools/testing/selftests/zram# sh zram.sh
zram.sh: 8: [: !=: unexpected operator
zram.sh : No zram.ko module or /dev/zram0 device file not found
zram.sh : CONFIG_ZRAM is not set

With this patch:
root@HGH1000007090:/opt/work/linux/tools/testing/selftests/zram# sh ./zram.sh
zram.sh : No zram.ko module or /dev/zram0 device file not found
zram.sh : CONFIG_ZRAM is not set

Signed-off-by: Zhang Zhen <zhenzhang.zhang-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
---
 tools/testing/selftests/zram/zram.sh     | 10 +---------
 tools/testing/selftests/zram/zram_lib.sh |  3 ++-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/tools/testing/selftests/zram/zram.sh b/tools/testing/selftests/zram/zram.sh
index 20de9a7..683a292 100755
--- a/tools/testing/selftests/zram/zram.sh
+++ b/tools/testing/selftests/zram/zram.sh
@@ -1,15 +1,7 @@
 #!/bin/bash
 TCID="zram.sh"

-check_prereqs()
-{
-	local msg="skip all tests:"
-
-	if [ $UID != 0 ]; then
-		echo $msg must be run as root >&2
-		exit 0
-	fi
-}
+. ./zram_lib.sh

 run_zram () {
 echo "--------------------"
diff --git a/tools/testing/selftests/zram/zram_lib.sh b/tools/testing/selftests/zram/zram_lib.sh
index 424e68e..f561a17 100755
--- a/tools/testing/selftests/zram/zram_lib.sh
+++ b/tools/testing/selftests/zram/zram_lib.sh
@@ -23,8 +23,9 @@ trap INT
 check_prereqs()
 {
 	local msg="skip all tests:"
+	local uid=$(id -u)

-	if [ $UID != 0 ]; then
+	if [ $uid -ne 0 ]; then
 		echo $msg must be run as root >&2
 		exit 0
 	fi
-- 
1.9.1


.

Re: [PATCH] seltests/zram: fix syntax error

[Shuah Khan]

On 09/13/2015 10:13 PM, Zhang Zhen wrote:
> Not all shells define a variable UID. This is a bash and zsh feature only.
> In other shells, the UID variable is not defined, so here test command
> expands to [ != 0 ] which is a syntax error.
> 
> Without this patch:
> root@HGH1000007090:/opt/work/linux/tools/testing/selftests/zram# sh zram.sh
> zram.sh: 8: [: !=: unexpected operator
> zram.sh : No zram.ko module or /dev/zram0 device file not found
> zram.sh : CONFIG_ZRAM is not set
> 
> With this patch:
> root@HGH1000007090:/opt/work/linux/tools/testing/selftests/zram# sh ./zram.sh
> zram.sh : No zram.ko module or /dev/zram0 device file not found
> zram.sh : CONFIG_ZRAM is not set
> 
> Signed-off-by: Zhang Zhen <zhenzhang.zhang-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
> ---
>  tools/testing/selftests/zram/zram.sh     | 10 +---------
>  tools/testing/selftests/zram/zram_lib.sh |  3 ++-
>  2 files changed, 3 insertions(+), 10 deletions(-)
> 

Thanks for fixing this. Applied to linux-kselftest fixes for 4.3-rc2

-- Shuah


-- 
Shuah Khan
Sr. Linux Kernel Developer
Open Source Innovation Group
Samsung Research America (Silicon Valley)
shuahkh-JPH+aEBZ4P+UEJcrhfAQsw@public.gmane.org | (970) 217-8978