[PATCH 1/2] selftests/zram: must be run as root

[PATCH 1/2] selftests/zram: must be run as root

[naresh.kamboju]

From: Naresh Kamboju <naresh.kamboju@linaro.org>

Adding new functionality check_prereqs() to check test must be run as root

Signed-off-by: Naresh Kamboju <naresh.kamboju@linaro.org>
---
 tools/testing/selftests/zram/zram.sh     | 12 ++++++++++++
 tools/testing/selftests/zram/zram01.sh   |  1 +
 tools/testing/selftests/zram/zram02.sh   |  1 +
 tools/testing/selftests/zram/zram_lib.sh | 10 ++++++++++
 4 files changed, 24 insertions(+)

diff --git a/tools/testing/selftests/zram/zram.sh b/tools/testing/selftests/zram/zram.sh
index 6ea4b6a..20de9a7 100755
--- a/tools/testing/selftests/zram/zram.sh
+++ b/tools/testing/selftests/zram/zram.sh
@@ -1,6 +1,16 @@
 #!/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
+}
+
 run_zram () {
 echo "--------------------"
 echo "running zram tests"
@@ -10,6 +20,8 @@ echo ""
 ./zram02.sh
 }
 
+check_prereqs
+
 # check zram module exists
 MODULE_PATH=/lib/modules/`uname -r`/kernel/drivers/block/zram/zram.ko
 if [ -f $MODULE_PATH ]; then
diff --git a/tools/testing/selftests/zram/zram01.sh b/tools/testing/selftests/zram/zram01.sh
index 2a2475d..b9566a6 100755
--- a/tools/testing/selftests/zram/zram01.sh
+++ b/tools/testing/selftests/zram/zram01.sh
@@ -79,6 +79,7 @@ zram_fill_fs()
 	echo "zram compression ratio: $(echo "scale=2; $v / 100 " | bc):1: OK"
 }
 
+check_prereqs
 zram_load
 zram_max_streams
 zram_compress_alg
diff --git a/tools/testing/selftests/zram/zram02.sh b/tools/testing/selftests/zram/zram02.sh
index 96e82dc..74569b8 100755
--- a/tools/testing/selftests/zram/zram02.sh
+++ b/tools/testing/selftests/zram/zram02.sh
@@ -37,6 +37,7 @@ zram_max_streams="2"
 zram_sizes="1048576" # 1M
 zram_mem_limits="1M"
 
+check_prereqs
 zram_load
 zram_max_streams
 zram_set_disksizes
diff --git a/tools/testing/selftests/zram/zram_lib.sh b/tools/testing/selftests/zram/zram_lib.sh
index 3b6abf1..424e68e 100755
--- a/tools/testing/selftests/zram/zram_lib.sh
+++ b/tools/testing/selftests/zram/zram_lib.sh
@@ -20,6 +20,16 @@ dev_mounted=-1
 
 trap INT
 
+check_prereqs()
+{
+	local msg="skip all tests:"
+
+	if [ $UID != 0 ]; then
+		echo $msg must be run as root >&2
+		exit 0
+	fi
+}
+
 zram_cleanup()
 {
 	echo "zram cleanup"
-- 
1.9.1

[PATCH 2/2] selftests/zram: Makefile fix

[naresh.kamboju]

From: Naresh Kamboju <naresh.kamboju@linaro.org>

Do not override run_tests, The default rule will just run TEST_PROGS

Signed-off-by: Naresh Kamboju <naresh.kamboju@linaro.org>
---
 tools/testing/selftests/zram/Makefile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tools/testing/selftests/zram/Makefile b/tools/testing/selftests/zram/Makefile
index ec45513..29d8034 100644
--- a/tools/testing/selftests/zram/Makefile
+++ b/tools/testing/selftests/zram/Makefile
@@ -5,8 +5,5 @@ TEST_FILES := zram01.sh zram02.sh zram_lib.sh
 
 include ../lib.mk
 
-run_tests:
-	@/bin/bash ./zram.sh
-
 clean:
 	$(RM) err.log
-- 
1.9.1

Re: [PATCH 2/2] selftests/zram: Makefile fix

[Michael Ellerman]

On Mon, 2015-08-31 at 17:11 +0530, naresh.kamboju@linaro.org wrote:
> From: Naresh Kamboju <naresh.kamboju@linaro.org>
> 
> Do not override run_tests, The default rule will just run TEST_PROGS
> 
> Signed-off-by: Naresh Kamboju <naresh.kamboju@linaro.org>

Thanks.

Acked-by: Michael Ellerman <mpe@ellerman.id.au>

cheers

Re: [PATCH 2/2] selftests/zram: Makefile fix

[Shuah Khan]

On 08/31/2015 06:58 PM, Michael Ellerman wrote:
> On Mon, 2015-08-31 at 17:11 +0530, naresh.kamboju@linaro.org wrote:
>> From: Naresh Kamboju <naresh.kamboju@linaro.org>
>>
>> Do not override run_tests, The default rule will just run TEST_PROGS
>>
>> Signed-off-by: Naresh Kamboju <naresh.kamboju@linaro.org>
> 
> Thanks.
> 
> Acked-by: Michael Ellerman <mpe@ellerman.id.au>
> 

Thank you both. Applied to linux-kselftest next for 4.3-rc1

-- Shuah


-- 
Shuah Khan
Sr. Linux Kernel Developer
Open Source Innovation Group
Samsung Research America (Silicon Valley)
shuahkh@osg.samsung.com | (970) 217-8978

Re: [PATCH 1/2] selftests/zram: must be run as root

[Shuah Khan]

On 08/31/2015 05:41 AM, naresh.kamboju@linaro.org wrote:
> From: Naresh Kamboju <naresh.kamboju@linaro.org>
> 
> Adding new functionality check_prereqs() to check test must be run as root
> 
> Signed-off-by: Naresh Kamboju <naresh.kamboju@linaro.org>
> ---

Thanks. Applied to linux-kselftest next for 4.3-rc1

-- Shuah

-- 
Shuah Khan
Sr. Linux Kernel Developer
Open Source Innovation Group
Samsung Research America (Silicon Valley)
shuahkh@osg.samsung.com | (970) 217-8978