From 86aa0ee7405b09655ae95fd64e037308ec9da95a Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 18 Feb 2009 21:19:47 +0100 Subject: [PATCH] tests: cleanup ts/minix Signed-off-by: Karel Zak --- tests/expected/{ts-minix-fsck => minix/fsck} | 0 tests/expected/{ts-minix-mkfs => minix/mkfs} | 0 tests/{ts-minix-fsck => ts/minix/fsck} | 10 ++++------ tests/{ts-minix-mkfs => ts/minix/mkfs} | 9 +++------ 4 files changed, 7 insertions(+), 12 deletions(-) rename tests/expected/{ts-minix-fsck => minix/fsck} (100%) rename tests/expected/{ts-minix-mkfs => minix/mkfs} (100%) rename tests/{ts-minix-fsck => ts/minix/fsck} (86%) rename tests/{ts-minix-mkfs => ts/minix/mkfs} (89%) 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 c58ed32d..33518fc6 100755 --- 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 7a2f2341..72770ba1 100755 --- 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" -- 2.39.5