From: Cyril H. <su...@li...> - 2013-10-29 06:51:12
|
The branch, master, has been updated via 8bec5d12646894cf29be8231ef5cb54fa468e22f (commit) via 700999e72a5a8a7e961f63b32622c9cdc6447f8c (commit) from 4177e38064cd4c35176132c5c38ac54e07f9033f (commit) - Log ----------------------------------------------------------------- commit 8bec5d12646894cf29be8231ef5cb54fa468e22f Author: Stanislav Kholmanskikh <sta...@or...> Date: Fri Oct 25 16:32:35 2013 +0400 kernel/connectors: TCONF vs TBROK, and fix check for root Fixed check for root the same way as in 08dcfbb5a4ebad9319c54935a600ab936708c6da. If the test is run on unsupported kernels it should return TCONF, not TBROK. Fixed this. Signed-off-by: Stanislav Kholmanskikh <sta...@or...> Reviewed-by: Wanlong Gao <gao...@cn...> commit 700999e72a5a8a7e961f63b32622c9cdc6447f8c Author: Honggyu Kim <hon...@lg...> Date: Mon Oct 28 12:06:32 2013 +0900 ext4-new-features: fix syntax error in configure In configure, string comparison is done using double assignment. /bin/sh doesn't allow to compare strings using "==". So "==" is modified to "=". Signed-off-by: Honggyu Kim <hon...@lg...> Reviewed-by: Wanlong Gao <gao...@cn...> ----------------------------------------------------------------------- Summary of changes: testcases/kernel/connectors/pec/run_pec_test | 8 ++++---- testcases/kernel/fs/ext4-new-features/configure | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testcases/kernel/connectors/pec/run_pec_test b/testcases/kernel/connectors/pec/run_pec_test index 7577ffa..2729485 100755 --- a/testcases/kernel/connectors/pec/run_pec_test +++ b/testcases/kernel/connectors/pec/run_pec_test @@ -33,14 +33,14 @@ export TST_COUNT=1 exit_status=0 -if [ "$USER" != root ]; then - tst_brkm TBROK ignored "Test must be run as root" +if [ $(id -u) != 0 ]; then + tst_brkm TCONF ignored "Test must be run as root" exit 0; fi grep cn_proc /proc/net/connector > /dev/null if [ $? -ne 0 ]; then - tst_brkm TBROK ignored "Process Event Connector is not supported or kernel is below 2.6.26" + tst_brkm TCONF ignored "Process Event Connector is not supported or kernel is below 2.6.26" exit 0; fi @@ -77,7 +77,7 @@ run_case() fi if [ $ret2 -eq 2 ]; then - tst_brkm TBROK NULL "connector may not be supported" + tst_brkm TCONF NULL "connector may not be supported" exit 0 fi diff --git a/testcases/kernel/fs/ext4-new-features/configure b/testcases/kernel/fs/ext4-new-features/configure index 13f43f9..12849e5 100755 --- a/testcases/kernel/fs/ext4-new-features/configure +++ b/testcases/kernel/fs/ext4-new-features/configure @@ -14,9 +14,9 @@ read EXT4_DEV echo "The partition is: $EXT4_DEV, Are you sure(Y/N)?" read RESULT -if [ "$RESULT" == "Y" ] || [ "$RESULT" == "y" ]; then +if [ "$RESULT" = "Y" ] || [ "$RESULT" = "y" ]; then echo "EXT4_DEV=$EXT4_DEV" > ./ext4-test-config -elif [ "$RESULT" == "N" ]; then +elif [ "$RESULT" = "N" ]; then echo "Give up specifing a partition!" else echo "Your input is wrong($RESULT)." hooks/post-receive -- ltp |