]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
tests: remove deprecated mount tests
authorRuediger Meier <ruediger.meier@ga-group.nl>
Sun, 1 Jun 2014 19:43:34 +0000 (21:43 +0200)
committerRuediger Meier <ruediger.meier@ga-group.nl>
Tue, 3 Jun 2014 11:12:42 +0000 (13:12 +0200)
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
tests/expected/mount/noncanonical [deleted file]
tests/expected/mount/paths [deleted file]
tests/ts/mount/noncanonical [deleted file]
tests/ts/mount/paths [deleted file]

diff --git a/tests/expected/mount/noncanonical b/tests/expected/mount/noncanonical
deleted file mode 100644 (file)
index 01c3a4f..0000000
+++ /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 (file)
index bec6697..0000000
+++ /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 (executable)
index a311577..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-#
-# Copyright (C) 2007 Karel Zak <kzak@redhat.com>
-#
-# 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 (executable)
index edc2837..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-#
-# Copyright (C) 2007 Karel Zak <kzak@redhat.com>
-#
-# 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
-