* Use 'test.sh' script and use 'tst_*'. * Add 'TCID' and 'TST_TOTAL' global variables.
* Use '.' instead of 'source'. * Use '$()' instead of '``'. * Some cleanup. Signed-off-by: Zeng Linggang <zenglg...@cn.fujitsu.com> --- testcases/kernel/security/smack/smack_set_cipso.sh | 73 +++++++++++----------- 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/testcases/kernel/security/smack/smack_set_cipso.sh b/testcases/kernel/security/smack/smack_set_cipso.sh index 1c7321f..c0a8a79 100755 --- a/testcases/kernel/security/smack/smack_set_cipso.sh +++ b/testcases/kernel/security/smack/smack_set_cipso.sh @@ -14,52 +14,53 @@ # 1 2 llllCCCCccccCCCCcccc 5 6 # 123456789012345678901234567890123456789012345678901234567890123456789 -source smack_common.sh +export TCID=smack_set_cipso +export TST_TOTAL=1 -RuleA="TheOne 2 0 " -RuleB="TheOne 3 1 55 " -RuleC="TheOne 4 2 17 33 " +. test.sh -OldRule=`grep "^TheOne" "$smackfsdir/cipso" 2>/dev/null` +. smack_common.sh -echo -n "$RuleA" 2>/dev/null > "$smackfsdir/cipso" -NewRule=`grep "^TheOne" "$smackfsdir/cipso" 2>/dev/null` -if [ "$NewRule" = "" ]; then - echo "Rule did not get set." - exit 1 +rule_a="TheOne 2 0 " +rule_b="TheOne 3 1 55 " +rule_c="TheOne 4 2 17 33 " + +old_rule=$(grep "^TheOne" "$smackfsdir/cipso" 2>/dev/null) + +echo -n "$rule_a" 2>/dev/null > "$smackfsdir/cipso" +new_rule=$(grep "^TheOne" "$smackfsdir/cipso" 2>/dev/null) +if [ "$new_rule" = "" ]; then + tst_brkm TFAIL "Rule did not get set." fi -Right=`echo "$NewRule" | grep ' 2'` -if [ "$Right" = "" ]; then - echo "Rule \"$NewRule\" is not set correctly." - exit 1 +right=$(echo "$new_rule" | grep ' 2') +if [ "$right" = "" ]; then + tst_brkm TFAIL "Rule \"$new_rule\" is not set correctly." fi -echo -n "$RuleB" 2>/dev/null > "$smackfsdir/cipso" -NewRule=`grep "^TheOne" "$smackfsdir/cipso" 2>/dev/null` -if [ "$NewRule" = "" ]; then - echo "Rule did not get set." - exit 1 +echo -n "$rule_b" 2>/dev/null > "$smackfsdir/cipso" +new_rule=$(grep "^TheOne" "$smackfsdir/cipso" 2>/dev/null) +if [ "$new_rule" = "" ]; then + tst_brkm TFAIL "Rule did not get set." fi -Right=`echo $NewRule | grep '/55'` -if [ "$Right" = "" ]; then - echo "Rule \"$NewRule\" is not set correctly." - exit 1 +right=$(echo $new_rule | grep '/55') +if [ "$right" = "" ]; then + tst_brkm TFAIL "Rule \"$new_rule\" is not set correctly." fi -echo -n "$RuleC" 2>/dev/null > "$smackfsdir/cipso" -NewRule=`grep "^TheOne" "$smackfsdir/cipso" 2>/dev/null` -if [ "$NewRule" = "" ]; then - echo "Rule did not get set." - exit 1 +echo -n "$rule_c" 2>/dev/null > "$smackfsdir/cipso" +new_rule=$(grep "^TheOne" "$smackfsdir/cipso" 2>/dev/null) +if [ "$new_rule" = "" ]; then + tst_brkm TFAIL "Rule did not get set." fi -Right=`echo "$NewRule" | grep '/17,33'` -if [ "$Right" = "" ]; then - echo "Rule \"$NewRule\" is not set correctly." - exit 1 +right=$(echo "$new_rule" | grep '/17,33') +if [ "$right" = "" ]; then + tst_brkm TFAIL "Rule \"$new_rule\" is not set correctly." fi -if [ "$OldRule" != "$NewRule" ]; then - cat <<EOM -Notice: Test access rule changed from "$OldRule" to "$NewRule". -EOM +if [ "$old_rule" != "$new_rule" ]; then + tst_resm TINFO "Notice: Test access rule changed from \"$old_rule\"" \ + "to \"$new_rule\"." fi + +tst_resm TPASS "Test \"$TCID\" success." +tst_exit -- 1.9.3 ------------------------------------------------------------------------------ New Year. New Location. New Benefits. New Data Center in Ashburn, VA. GigeNET is offering a free month of service with a new server in Ashburn. Choose from 2 high performing configs, both with 100TB of bandwidth. Higher redundancy.Lower latency.Increased capacity.Completely compliant. http://p.sf.net/sfu/gigenet _______________________________________________ Ltp-list mailing list Ltp-list@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/ltp-list
