tests: cleanup ts/namei

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

diff --git a/tests/expected/namei/logic b/tests/expected/namei/logic
index c27e76b3d6942e3c504a7649a3402aa95d4d08ce..b505e34b45e6397fd1045ee3d62d0840a30fcb81 100644 (file)
--- a/tests/expected/namei/logic
+++ b/tests/expected/namei/logic
@@ -1,13 +1,9 @@
-f: output/namei/namei1/namei2/a
- d output
- d namei
+f: namei1/namei2/a
  d namei1
  d namei2
  - a
-f: output/namei/namei1/namei2/b
- d output
- d namei
+f: namei1/namei2/b
  d namei1
  d namei2
  - b
-namei: failed to stat: output/namei/namei1/namei2/a/b: Not a directory
+namei: failed to stat: namei1/namei2/a/b: Not a directory

diff --git a/tests/ts/namei/logic b/tests/ts/namei/logic
index 5ef8369ce92360d25e3891b9f4c9d51c35d2fe0c..f396712e19d571f4f4f9a10394ad0aa7f8fbc591 100755 (executable)
--- a/tests/ts/namei/logic
+++ b/tests/ts/namei/logic
@@ -15,22 +15,20 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
-. ./commands.sh
-. ./functions.sh
-
-TS_COMPONENT="namei"
-TS_DESC="logic"
+TS_TOPDIR="$(dirname $0)/../.."
+TS_DESC="basic functionality"
 
+. $TS_TOPDIR/functions.sh
 ts_init "$*"
 
-SANDBOX="$TS_OUTDIR/namei"
+cd $TS_OUTDIR
 
-mkdir -p $SANDBOX/namei1/namei2
-touch $SANDBOX/namei1/namei2/a $SANDBOX/namei1/namei2/b
+mkdir -p namei1/namei2
+touch namei1/namei2/a namei1/namei2/b
 
-$TS_CMD_NAMEI $SANDBOX/namei1/namei2/a   >> $TS_OUTPUT 2>&1
-$TS_CMD_NAMEI $SANDBOX/namei1/namei2/b   >> $TS_OUTPUT 2>&1
-$TS_CMD_NAMEI $SANDBOX/namei1/namei2/a/b >> $TS_OUTPUT 2>&1
+$TS_CMD_NAMEI namei1/namei2/a   >> $TS_OUTPUT 2>&1
+$TS_CMD_NAMEI namei1/namei2/b   >> $TS_OUTPUT 2>&1
+$TS_CMD_NAMEI namei1/namei2/a/b >> $TS_OUTPUT 2>&1
 
 ts_finalize