From: Ruediger Meier Date: Sun, 1 Jun 2014 19:43:34 +0000 (+0200) Subject: tests: remove deprecated mount tests X-Git-Tag: v2.25-rc1~50^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f5aac3506d3a79e4aceb07ab3964ed60c5c6f3a;p=thirdparty%2Futil-linux.git tests: remove deprecated mount tests Signed-off-by: Ruediger Meier --- diff --git a/tests/expected/mount/noncanonical b/tests/expected/mount/noncanonical deleted file mode 100644 index 01c3a4f5af..0000000000 --- a/tests/expected/mount/noncanonical +++ /dev/null @@ -1,2 +0,0 @@ -mount: spec: "//etc" -mount: spec: "/etc" diff --git a/tests/expected/mount/paths b/tests/expected/mount/paths deleted file mode 100644 index bec6697beb..0000000000 --- a/tests/expected/mount/paths +++ /dev/null @@ -1,11 +0,0 @@ -mount: fstab path: "/etc/fstab" -mount: mtab path: "/etc/mtab" -mount: lock path: "/etc/mtab~" -mount: temp path: "/etc/mtab.tmp" -mount: UID: 0 -mount: eUID: 0 -mount: spec: "/dev/dummy" -mount: node: "/mnt" -mount: types: "(null)" -mount: opts: "(null)" -/dev/dummy on /mnt type unknown (rw) diff --git a/tests/ts/mount/noncanonical b/tests/ts/mount/noncanonical deleted file mode 100755 index a311577f0b..0000000000 --- a/tests/ts/mount/noncanonical +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# -# Copyright (C) 2007 Karel Zak -# -# This file is part of util-linux. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This file is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -TS_TOPDIR="${0%/*}/../.." -TS_DESC="non canonical path" - -. $TS_TOPDIR/functions.sh -ts_init "$*" - -ts_check_test_command "$TS_CMD_MOUNT" - -ts_skip_nonroot - -[ ! -e "/etc" ] && ts_skip "/etc not such file of directory" - -$TS_CMD_MOUNT -V | grep -q "libmount" -[ $? -eq 0 ] && ts_skip "libmount version" - -# Don't canonicalize SPEC for cifs, nfs, smbfs, ... -$TS_CMD_MOUNT -v -v -v -f -i -n -t cifs //etc /foo | grep "spec:" >> $TS_OUTPUT 2>&1 - -# Canonicalize when FS type undefined and the SPEC exists -$TS_CMD_MOUNT -v -v -v -f -i -n //etc /foo | grep "spec:" >> $TS_OUTPUT 2>&1 - -ts_finalize - diff --git a/tests/ts/mount/paths b/tests/ts/mount/paths deleted file mode 100755 index edc283757a..0000000000 --- a/tests/ts/mount/paths +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -# -# Copyright (C) 2007 Karel Zak -# -# This file is part of util-linux. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This file is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -TS_TOPDIR="${0%/*}/../.." -TS_DESC="basic paths" - -. $TS_TOPDIR/functions.sh -ts_init "$*" - -ts_check_test_command "$TS_CMD_MOUNT" - -ts_skip_nonroot - -$TS_CMD_MOUNT -V | grep -q "libmount" -[ $? -eq 0 ] && ts_skip "libmount version" - -$TS_CMD_MOUNT -n -f -v -v -v /dev/dummy /mnt &> $TS_OUTPUT - -ts_finalize -