tests: cleanup ts/minix

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

diff --git a/tests/expected/ts-minix-fsck b/tests/expected/minix/fsck
similarity index 100%
rename from tests/expected/ts-minix-fsck
rename to tests/expected/minix/fsck

diff --git a/tests/expected/ts-minix-mkfs b/tests/expected/minix/mkfs
similarity index 100%
rename from tests/expected/ts-minix-mkfs
rename to tests/expected/minix/mkfs

diff --git a/tests/ts-minix-fsck b/tests/ts/minix/fsck
similarity index 86%
rename from tests/ts-minix-fsck
rename to tests/ts/minix/fsck
index c58ed32d25c6a155153edca7441a1c64cbb52e02..33518fc62017ed9e7308e8cab9faf416d836589b 100755 (executable)
--- a/tests/ts-minix-fsck
+++ b/tests/ts/minix/fsck
@@ -14,18 +14,16 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
-. ./commands.sh
-. ./functions.sh
-
-TS_COMPONENT="minix"
-TS_DESC="fsck"
+TS_TOPDIR="$(dirname $0)/../.."
+TS_DESC="mkfs checksums"
 
+. $TS_TOPDIR/functions.sh
 ts_init "$*"
 ts_skip_nonroot
 
 set -o pipefail
 
-IMAGE="$TS_OUTDIR/minix-loop.img"
+IMAGE="$TS_OUTDIR/${TS_TESTNAME}-loop.img"
 DEVICE=$(ts_device_init)
 
 ts_log "create minix fs"

diff --git a/tests/ts-minix-mkfs b/tests/ts/minix/mkfs
similarity index 89%
rename from tests/ts-minix-mkfs
rename to tests/ts/minix/mkfs
index 7a2f2341323cee757a55e624b2d105ab17597439..72770ba186d6805b16dca50351578ddecfe0e484 100755 (executable)
--- a/tests/ts-minix-mkfs
+++ b/tests/ts/minix/mkfs
@@ -14,19 +14,16 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
-. ./commands.sh
-. ./functions.sh
-
-TS_COMPONENT="minix"
+TS_TOPDIR="$(dirname $0)/../.."
 TS_DESC="mkfs"
 
+. $TS_TOPDIR/functions.sh
 ts_init "$*"
 ts_skip_nonroot
 
 set -o pipefail
 
-IMAGE="$TS_OUTDIR/minix-loop.img"
-TS_MOUNTPOINT="$TS_OUTDIR/minix-mnt"
+IMAGE="$TS_OUTDIR/${TS_TESTNAME}-loop.img"
 DEVICE=$(ts_device_init)
 
 ts_log "create minix fs"