summaryrefslogtreecommitdiffstats
path: root/tests/ts/ipcs
diff options
context:
space:
mode:
authorKarel Zak2009-01-19 23:57:10 +0100
committerKarel Zak2009-02-11 23:30:48 +0100
commit1016b53f61b859439ac4393a4172a4612856885e (patch)
tree812aee068f907459f134c2ff7771a8a75697c4c4 /tests/ts/ipcs
parenttests: cleanup ts/hwclock (diff)
downloadkernel-qcow2-util-linux-1016b53f61b859439ac4393a4172a4612856885e.tar.gz
kernel-qcow2-util-linux-1016b53f61b859439ac4393a4172a4612856885e.tar.xz
kernel-qcow2-util-linux-1016b53f61b859439ac4393a4172a4612856885e.zip
tests: cleanup ts/ipcs
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/ts/ipcs')
-rw-r--r--tests/ts/ipcs/functions.sh6
-rwxr-xr-xtests/ts/ipcs/headers6
-rwxr-xr-xtests/ts/ipcs/limits7
-rwxr-xr-xtests/ts/ipcs/limits23
4 files changed, 11 insertions, 11 deletions
diff --git a/tests/ts/ipcs/functions.sh b/tests/ts/ipcs/functions.sh
index ff35e75ea..d742d8ef0 100644
--- a/tests/ts/ipcs/functions.sh
+++ b/tests/ts/ipcs/functions.sh
@@ -38,9 +38,9 @@ IPCS_KERNEL_CMD=(
# data from the ipcs command
IPCS_CMD=(
- "$TS_CMD_IPCS -m -l | $AWK '/max number of segments/ { print \$6 }'"
- "$TS_CMD_IPCS -m -l | $AWK '/max total shared memory/ { print \$7 }'"
- "$TS_CMD_IPCS -m -l | $AWK '/max seg size/ { print \$6 }'"
+ "$TS_CMD_IPCS -m -l | awk '/max number of segments/ { print \$6 }'"
+ "$TS_CMD_IPCS -m -l | awk '/max total shared memory/ { print \$7 }'"
+ "$TS_CMD_IPCS -m -l | awk '/max seg size/ { print \$6 }'"
)
diff --git a/tests/ts/ipcs/headers b/tests/ts/ipcs/headers
index 8a391d0c9..53bc3d1ae 100755
--- a/tests/ts/ipcs/headers
+++ b/tests/ts/ipcs/headers
@@ -15,12 +15,10 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
-. ./commands.sh
-. ./functions.sh
-
-TS_COMPONENT="ipcs"
+TS_TOPDIR="$(dirname $0)/../.."
TS_DESC="headers"
+. $TS_TOPDIR/functions.sh
ts_init "$*"
ts_log "test: shm headers"
diff --git a/tests/ts/ipcs/limits b/tests/ts/ipcs/limits
index 0fb316064..c4efb9cce 100755
--- a/tests/ts/ipcs/limits
+++ b/tests/ts/ipcs/limits
@@ -15,14 +15,15 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
-. ./commands.sh
-. ./functions.sh
-TS_COMPONENT="ipcs"
+TS_TOPDIR="$(dirname $0)/../.."
TS_DESC="limits overflow"
+. $TS_TOPDIR/functions.sh
+
ts_init "$*"
ts_skip_nonroot
+
. $TS_SELF/functions.sh
ts_log "load original values"
diff --git a/tests/ts/ipcs/limits2 b/tests/ts/ipcs/limits2
index 17c3c702f..db2ca2b98 100755
--- a/tests/ts/ipcs/limits2
+++ b/tests/ts/ipcs/limits2
@@ -16,9 +16,10 @@
# GNU General Public License for more details.
#
+TS_TOPDIR="$(dirname $0)/../.."
TS_DESC="basic limits"
-. ./functions.sh
+. $TS_TOPDIR/functions.sh
ts_init "$*"
. $TS_SELF/functions.sh