tests: cleanup ts/ipcs

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/tests/functions.sh b/tests/functions.sh
index 903f4ba229701e9989dde1c34bb4c70fb4911fc2..6dbbeb7760967bc9261a216fbc5b7165b6fc5cd5 100644 (file)
--- a/tests/functions.sh
+++ b/tests/functions.sh
@@ -80,7 +80,7 @@ function ts_init {
 
        TS_OUTDIR="$TS_TOPDIR/output/$TS_COMPONENT"
        TS_OUTPUT="$TS_OUTDIR/$TS_TESTNAME"
-       TS_DIFFDIR="$TS_DIFFDIR/diff/$TS_COMPONENT"
+       TS_DIFFDIR="$TS_TOPDIR/diff/$TS_COMPONENT"
        TS_DIFF="$TS_DIFFDIR/$TS_TESTNAME"
        TS_EXPECTED="$TS_TOPDIR/expected/$TS_NS"
        TS_MOUNTPOINT="$TS_OUTDIR/${TS_TESTNAME}-mnt"

diff --git a/tests/ts/ipcs/functions.sh b/tests/ts/ipcs/functions.sh
index ff35e75ea9c88b19d0e71c9d5cc675d8e6b4df4e..d742d8ef070ed638337a5b33690e5cd01e6a535d 100644 (file)
--- 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 8a391d0c9019508a377b23f1d1adcc4671f51390..53bc3d1ae97f4efef3048a4ab3883b5222299036 100755 (executable)
--- 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 0fb316064765d9b03211cac3f7eae01c4a6eecc8..c4efb9cce994e6337ad24d16719a8c67dc051b28 100755 (executable)
--- 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 17c3c702f049bc08d3ecc334d731b1468697790d..db2ca2b986ebd14a5162a2d15e78e64878d18ac3 100755 (executable)
--- 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