summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorKarel Zak <kzak@redhat.com>2009-02-18 21:19:47 +0100
committerKarel Zak <kzak@redhat.com>2009-02-18 21:19:47 +0100
commit86aa0ee7405b09655ae95fd64e037308ec9da95a (patch)
tree10b341611265f7e7070279c56372b6006915fad7 /tests
parentefc09ae32954a4466c29f4de898d10132c830b5e (diff)
downloadutil-linux-old-86aa0ee7405b09655ae95fd64e037308ec9da95a.tar.gz
tests: cleanup ts/minix
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/expected/minix/fsck (renamed from tests/expected/ts-minix-fsck)0
-rw-r--r--tests/expected/minix/mkfs (renamed from tests/expected/ts-minix-mkfs)0
-rwxr-xr-xtests/ts/minix/fsck (renamed from tests/ts-minix-fsck)10
-rwxr-xr-xtests/ts/minix/mkfs (renamed from tests/ts-minix-mkfs)9
4 files changed, 7 insertions, 12 deletions
diff --git a/tests/expected/ts-minix-fsck b/tests/expected/minix/fsck
index 84de7255..84de7255 100644
--- a/tests/expected/ts-minix-fsck
+++ b/tests/expected/minix/fsck
diff --git a/tests/expected/ts-minix-mkfs b/tests/expected/minix/mkfs
index 592d5dc9..592d5dc9 100644
--- a/tests/expected/ts-minix-mkfs
+++ b/tests/expected/minix/mkfs
diff --git a/tests/ts-minix-fsck b/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
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"