From f0b561b63207f679881e73a23a2374c08d340086 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Am=C3=A9rico=20Wang?= <xiyou.wangcong@gmail.com>
Date: Thu, 6 Nov 2008 15:46:22 +0000
Subject: [PATCH] tests: clean up the testing scripts

Do some cleanups to the testing scripts.

Signed-off-by: WANG Cong <wangcong@zeuux.org>
---
 tests/functions.sh     | 4 ++--
 tests/ts-ipcs-limits   | 6 +-----
 tests/ts-mount-special | 4 ++--
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/tests/functions.sh b/tests/functions.sh
index a39c98b61..d57d19d86 100644
--- a/tests/functions.sh
+++ b/tests/functions.sh
@@ -22,14 +22,14 @@ TS_VERBOSE="no"
 
 function ts_skip {
 	echo " IGNORE ($1)"
-	if [ -n "$2" ] && [ -b "$2" ]; then
+	if [ -n "$2" -a -b "$2" ]; then
 		ts_device_deinit "$2"
 	fi
 	exit 0
 }
 
 function ts_skip_nonroot {
-	if [ $UID != 0 ]; then
+	if [ $UID -ne 0 ]; then
 		ts_skip "not root permissions"
 	fi
 }
diff --git a/tests/ts-ipcs-limits b/tests/ts-ipcs-limits
index ce760c382..6224ac440 100755
--- a/tests/ts-ipcs-limits
+++ b/tests/ts-ipcs-limits
@@ -21,14 +21,10 @@
 TS_COMPONENT="ipcs"
 TS_DESC="limits overflow"
 
-if [ $UID != 0 ]; then
-	ts_init "$*"
-	ts_skip_nonroot
-fi
-
 . ./ts-ipcs.sh
 
 ts_init "$*"
+ts_skip_nonroot
 
 ts_log "load original values"
 for i in $IPCS_IDX; do
diff --git a/tests/ts-mount-special b/tests/ts-mount-special
index 88b9d91de..9ec78836c 100755
--- a/tests/ts-mount-special
+++ b/tests/ts-mount-special
@@ -26,12 +26,12 @@ MOUNTER="/sbin/mount.mytest"
 ts_init "$*"
 ts_skip_nonroot
 
-cat > $MOUNTER << EOF
+cat > $MOUNTER <<\EOF
 #!/bin/bash
 # This util-linux-ng regression test component
 # It's safe to remove me...
 #
-echo "\$0 called with \"\$*\""
+echo "$0 called with \"$*\""
 EOF
 chmod +x $MOUNTER