Drop tests from master

144 files changed, 0 insertions, 3675 deletions

diff --git a/tests/log/lastlog/01_lastlog_no_lastlog/config.txt b/tests/log/lastlog/01_lastlog_no_lastlog/config.txt
deleted file mode 100644
index 1a78b6cd..00000000
--- a/tests/log/lastlog/01_lastlog_no_lastlog/config.txt
+++ /dev/null
@@ -1 +0,0 @@
-user foo exists, UID 1000
diff --git a/tests/log/lastlog/01_lastlog_no_lastlog/config/etc/group b/tests/log/lastlog/01_lastlog_no_lastlog/config/etc/group
deleted file mode 100644
index b6fae894..00000000
--- a/tests/log/lastlog/01_lastlog_no_lastlog/config/etc/group
+++ /dev/null
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root,foo
-tty:x:5:
-disk:x:6:
-lp:x:7:foo,root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:foo
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:foo
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:foo
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:
diff --git a/tests/log/lastlog/01_lastlog_no_lastlog/config/etc/gshadow b/tests/log/lastlog/01_lastlog_no_lastlog/config/etc/gshadow
deleted file mode 100644
index 1f2ba8da..00000000
--- a/tests/log/lastlog/01_lastlog_no_lastlog/config/etc/gshadow
+++ /dev/null
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root,foo
-tty:*::foo
-disk:*:foo:
-lp:*::foo,root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*:foo:foo
-voice:*::
-cdrom:*:foo:foo
-floppy:*::foo
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-foo:*::
diff --git a/tests/log/lastlog/01_lastlog_no_lastlog/config/etc/passwd b/tests/log/lastlog/01_lastlog_no_lastlog/config/etc/passwd
deleted file mode 100644
index bf52df00..00000000
--- a/tests/log/lastlog/01_lastlog_no_lastlog/config/etc/passwd
+++ /dev/null
@@ -1,20 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-foo:x:1000:1000::/home/foo:/bin/false
diff --git a/tests/log/lastlog/01_lastlog_no_lastlog/config/etc/shadow b/tests/log/lastlog/01_lastlog_no_lastlog/config/etc/shadow
deleted file mode 100644
index 2baad3b4..00000000
--- a/tests/log/lastlog/01_lastlog_no_lastlog/config/etc/shadow
+++ /dev/null
@@ -1,20 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::
diff --git a/tests/log/lastlog/01_lastlog_no_lastlog/data/lastlog.err b/tests/log/lastlog/01_lastlog_no_lastlog/data/lastlog.err
deleted file mode 100644
index 935fdb5e..00000000
--- a/tests/log/lastlog/01_lastlog_no_lastlog/data/lastlog.err
+++ /dev/null
@@ -1 +0,0 @@
-/var/log/lastlog: No such file or directory
diff --git a/tests/log/lastlog/01_lastlog_no_lastlog/lastlog.test b/tests/log/lastlog/01_lastlog_no_lastlog/lastlog.test
deleted file mode 100755
index d903f883..00000000
--- a/tests/log/lastlog/01_lastlog_no_lastlog/lastlog.test
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../../common/config.sh
-. ../../../common/log.sh
-
-log_start "$0" "lastlog detects missing /var/log/lastlog and does not create it"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config; touch /var/log/lastlog' 0
-
-change_config
-
-echo -n "Remove /var/log/lastlog (it will not be restored)..."
-rm -f /var/log/lastlog
-echo "OK"
-
-echo -n "Execute lastlog (lastlog)..."
-lastlog 2>tmp/lastlog.err && exit 1 || {
-	status=$?
-}
-echo "OK"
-
-echo -n "Check returned status ($status)..."
-test "$status" = "1"
-echo "OK"
-
-echo "lastlog reported:"
-echo "======================================================================="
-cat tmp/lastlog.err
-echo "======================================================================="
-echo -n "Check the usage message..."
-diff -au data/lastlog.err tmp/lastlog.err
-echo "usage message OK."
-rm -f tmp/lastlog.err
-
-echo -n "Check that the /var/log/lastlog file was not created"...
-test ! -f /var/log/lastlog
-echo "OK"
-
-touch /var/log/lastlog
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/log/lastlog/02_lastlog_usage/config.txt b/tests/log/lastlog/02_lastlog_usage/config.txt
deleted file mode 100644
index 31f56359..00000000
--- a/tests/log/lastlog/02_lastlog_usage/config.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# no testsuite password
-# root password: rootF00barbaz
-# myuser password: myuserF00barbaz
-
-user foo, in group users (only in /etc/group)
-user foo, in group tty (only in /etc/gshadow)
-user foo, in group floppy
-user foo, admin of group disk
-user foo, admin and member of group fax
-user foo, admin and member of group cdrom (only in /etc/gshadow)
diff --git a/tests/log/lastlog/02_lastlog_usage/config/etc/group b/tests/log/lastlog/02_lastlog_usage/config/etc/group
deleted file mode 100644
index 10123908..00000000
--- a/tests/log/lastlog/02_lastlog_usage/config/etc/group
+++ /dev/null
@@ -1,41 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:
-adm:x:4:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
diff --git a/tests/log/lastlog/02_lastlog_usage/config/etc/gshadow b/tests/log/lastlog/02_lastlog_usage/config/etc/gshadow
deleted file mode 100644
index ae424865..00000000
--- a/tests/log/lastlog/02_lastlog_usage/config/etc/gshadow
+++ /dev/null
@@ -1,41 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::
-adm:*::
-tty:*::
-disk:*::
-lp:*::
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*::
-voice:*::
-cdrom:*::
-floppy:*::
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
diff --git a/tests/log/lastlog/02_lastlog_usage/config/etc/passwd b/tests/log/lastlog/02_lastlog_usage/config/etc/passwd
deleted file mode 100644
index 43fc135a..00000000
--- a/tests/log/lastlog/02_lastlog_usage/config/etc/passwd
+++ /dev/null
@@ -1,19 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
diff --git a/tests/log/lastlog/02_lastlog_usage/config/etc/shadow b/tests/log/lastlog/02_lastlog_usage/config/etc/shadow
deleted file mode 100644
index 5f50d187..00000000
--- a/tests/log/lastlog/02_lastlog_usage/config/etc/shadow
+++ /dev/null
@@ -1,19 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
diff --git a/tests/log/lastlog/02_lastlog_usage/data/usage.out b/tests/log/lastlog/02_lastlog_usage/data/usage.out
deleted file mode 100644
index 410197eb..00000000
--- a/tests/log/lastlog/02_lastlog_usage/data/usage.out
+++ /dev/null
@@ -1,9 +0,0 @@
-Usage: lastlog [options]
-
-Options:
-  -b, --before DAYS             print only lastlog records older than DAYS
-  -h, --help                    display this help message and exit
-  -R, --root CHROOT_DIR         directory to chroot into
-  -t, --time DAYS               print only lastlog records more recent than DAYS
-  -u, --user LOGIN              print lastlog record of the specified LOGIN
-
diff --git a/tests/log/lastlog/02_lastlog_usage/lastlog.test b/tests/log/lastlog/02_lastlog_usage/lastlog.test
deleted file mode 100755
index 344a1042..00000000
--- a/tests/log/lastlog/02_lastlog_usage/lastlog.test
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../../common/config.sh
-. ../../../common/log.sh
-
-log_start "$0" "lastlog can display its usage message"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Get lastlog usage (lastlog -h)..."
-lastlog -h >tmp/usage.out
-echo "OK"
-
-echo "lastlog reported:"
-echo "======================================================================="
-cat tmp/usage.out
-echo "======================================================================="
-echo -n "Check the usage message..."
-diff -au data/usage.out tmp/usage.out
-echo "usage message OK."
-rm -f tmp/usage.out
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/log/lastlog/03_lastlog_format/config.txt b/tests/log/lastlog/03_lastlog_format/config.txt
deleted file mode 100644
index 1a78b6cd..00000000
--- a/tests/log/lastlog/03_lastlog_format/config.txt
+++ /dev/null
@@ -1 +0,0 @@
-user foo exists, UID 1000
diff --git a/tests/log/lastlog/03_lastlog_format/config/etc/group b/tests/log/lastlog/03_lastlog_format/config/etc/group
deleted file mode 100644
index b6fae894..00000000
--- a/tests/log/lastlog/03_lastlog_format/config/etc/group
+++ /dev/null
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root,foo
-tty:x:5:
-disk:x:6:
-lp:x:7:foo,root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:foo
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:foo
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:foo
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:
diff --git a/tests/log/lastlog/03_lastlog_format/config/etc/gshadow b/tests/log/lastlog/03_lastlog_format/config/etc/gshadow
deleted file mode 100644
index 1f2ba8da..00000000
--- a/tests/log/lastlog/03_lastlog_format/config/etc/gshadow
+++ /dev/null
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root,foo
-tty:*::foo
-disk:*:foo:
-lp:*::foo,root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*:foo:foo
-voice:*::
-cdrom:*:foo:foo
-floppy:*::foo
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-foo:*::
diff --git a/tests/log/lastlog/03_lastlog_format/config/etc/passwd b/tests/log/lastlog/03_lastlog_format/config/etc/passwd
deleted file mode 100644
index ae6ebfe9..00000000
--- a/tests/log/lastlog/03_lastlog_format/config/etc/passwd
+++ /dev/null
@@ -1,20 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-foo:x:1000:1000::/home/foo:/bin/sh
diff --git a/tests/log/lastlog/03_lastlog_format/config/etc/shadow b/tests/log/lastlog/03_lastlog_format/config/etc/shadow
deleted file mode 100644
index 2baad3b4..00000000
--- a/tests/log/lastlog/03_lastlog_format/config/etc/shadow
+++ /dev/null
@@ -1,20 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::
diff --git a/tests/log/lastlog/03_lastlog_format/data/lastlog.out b/tests/log/lastlog/03_lastlog_format/data/lastlog.out
deleted file mode 100644
index 280e1abf..00000000
--- a/tests/log/lastlog/03_lastlog_format/data/lastlog.out
+++ /dev/null
@@ -1,20 +0,0 @@
-Username         Port     From             Latest
-root                                       **Never logged in**
-daemon                                     **Never logged in**
-bin                                        **Never logged in**
-sys                                        **Never logged in**
-sync                                       **Never logged in**
-games                                      **Never logged in**
-man                                        **Never logged in**
-lp                                         **Never logged in**
-mail                                       **Never logged in**
-news                                       **Never logged in**
-uucp                                       **Never logged in**
-proxy                                      **Never logged in**
-www-data                                   **Never logged in**
-backup                                     **Never logged in**
-list                                       **Never logged in**
-irc                                        **Never logged in**
-gnats                                      **Never logged in**
-nobody                                     **Never logged in**
-Debian-exim                                **Never logged in**
diff --git a/tests/log/lastlog/03_lastlog_format/lastlog.test b/tests/log/lastlog/03_lastlog_format/lastlog.test
deleted file mode 100755
index b59c19b4..00000000
--- a/tests/log/lastlog/03_lastlog_format/lastlog.test
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../../common/config.sh
-. ../../../common/log.sh
-
-log_start "$0" "reports all entry from /var/log/lastlog"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Create an empty /var/log/lastlog (it will not be restored)..."
-> /var/log/lastlog
-echo "OK"
-
-cp data/lastlog.out tmp/lastlog.out1
-cp data/lastlog.out tmp/lastlog.out2
-TTY=0
-while true
-do
-	[ ! -e /dev/pts/$TTY ] && break
-	TTY=$((TTY+1))
-done
-	
-
-DATE=$(LC_ALL=C date +"%a %b %e %H:%M:%S %z %Y")
-printf "%-16s %-8.8s %-16.16s %s\n" foo "pts/$TTY" "" "$DATE" >> tmp/lastlog.out1
-
-echo -n "Trigger a connection as foo..."
-./login.exp
-echo "OK"
-
-DATE=$(LC_ALL=C date +"%a %b %e %H:%M:%S %z %Y")
-printf "%-16s %-8.8s %-16.16s %s\n" foo "pts/$TTY" "" "$DATE" >> tmp/lastlog.out2
-
-echo -n "lastlog..."
-lastlog > tmp/lastlog.out
-echo "OK."
-
-echo "lastlog :"
-echo "======================================================================="
-cat tmp/lastlog.out
-echo "======================================================================="
-
-echo -n "Check the lastlog message..."
-diff -au tmp/lastlog.out tmp/lastlog.out1 || diff -au tmp/lastlog.out tmp/lastlog.out2
-echo "lastlog message OK."
-rm -f tmp/lastlog.out tmp/lastlog.out1 tmp/lastlog.out2
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/log/lastlog/03_lastlog_format/login.exp b/tests/log/lastlog/03_lastlog_format/login.exp
deleted file mode 100755
index c8866d92..00000000
--- a/tests/log/lastlog/03_lastlog_format/login.exp
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/expect
-
-set timeout 2
-expect_after default {puts "\nFAIL"; exit 1}
-
-spawn /bin/bash
-expect "# "
-
-send "login -f foo\r"
-expect "$ "
-
-send "exit\r"
-exit 0
diff --git a/tests/log/lastlog/04_lastlog_mulitple/config.txt b/tests/log/lastlog/04_lastlog_mulitple/config.txt
deleted file mode 100644
index 1a78b6cd..00000000
--- a/tests/log/lastlog/04_lastlog_mulitple/config.txt
+++ /dev/null
@@ -1 +0,0 @@
-user foo exists, UID 1000
diff --git a/tests/log/lastlog/04_lastlog_mulitple/config/etc/group b/tests/log/lastlog/04_lastlog_mulitple/config/etc/group
deleted file mode 100644
index b6fae894..00000000
--- a/tests/log/lastlog/04_lastlog_mulitple/config/etc/group
+++ /dev/null
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root,foo
-tty:x:5:
-disk:x:6:
-lp:x:7:foo,root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:foo
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:foo
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:foo
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:
diff --git a/tests/log/lastlog/04_lastlog_mulitple/config/etc/gshadow b/tests/log/lastlog/04_lastlog_mulitple/config/etc/gshadow
deleted file mode 100644
index 1f2ba8da..00000000
--- a/tests/log/lastlog/04_lastlog_mulitple/config/etc/gshadow
+++ /dev/null
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root,foo
-tty:*::foo
-disk:*:foo:
-lp:*::foo,root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*:foo:foo
-voice:*::
-cdrom:*:foo:foo
-floppy:*::foo
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-foo:*::
diff --git a/tests/log/lastlog/04_lastlog_mulitple/config/etc/passwd b/tests/log/lastlog/04_lastlog_mulitple/config/etc/passwd
deleted file mode 100644
index 9d34d3af..00000000
--- a/tests/log/lastlog/04_lastlog_mulitple/config/etc/passwd
+++ /dev/null
@@ -1,22 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-bar:x:1001:1001::/home/bar:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-foo:x:1000:1000::/home/foo:/bin/sh
-baz:x:1002:1002::/home/baz:/bin/sh
diff --git a/tests/log/lastlog/04_lastlog_mulitple/config/etc/shadow b/tests/log/lastlog/04_lastlog_mulitple/config/etc/shadow
deleted file mode 100644
index 972f2cd0..00000000
--- a/tests/log/lastlog/04_lastlog_mulitple/config/etc/shadow
+++ /dev/null
@@ -1,22 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-bar:!:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::
-baz:!:12977:0:99999:7:::
diff --git a/tests/log/lastlog/04_lastlog_mulitple/data/lastlog.list b/tests/log/lastlog/04_lastlog_mulitple/data/lastlog.list
deleted file mode 100644
index ae27a131..00000000
--- a/tests/log/lastlog/04_lastlog_mulitple/data/lastlog.list
+++ /dev/null
@@ -1,4 +0,0 @@
-Username
-bar
-foo
-baz
diff --git a/tests/log/lastlog/04_lastlog_mulitple/lastlog.test b/tests/log/lastlog/04_lastlog_mulitple/lastlog.test
deleted file mode 100755
index 630c7f5b..00000000
--- a/tests/log/lastlog/04_lastlog_mulitple/lastlog.test
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../../common/config.sh
-. ../../../common/log.sh
-
-log_start "$0" "reports all entry from /var/log/lastlog"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Create an empty /var/log/lastlog (it will not be restored)..."
-> /var/log/lastlog
-echo "OK"
-
-echo -n "Trigger a connection as foo..."
-./login.exp foo
-echo "OK"
-echo -n "Trigger a connection as bar..."
-./login.exp bar
-echo "OK"
-echo -n "Trigger a connection as baz..."
-./login.exp baz
-echo "OK"
-
-echo -n "lastlog..."
-lastlog > tmp/lastlog.out
-echo "OK."
-
-echo "lastlog :"
-echo "======================================================================="
-cat tmp/lastlog.out
-echo "======================================================================="
-
-echo -n "Check the list of logged in users..."
-cat tmp/lastlog.out | grep -v "Never logged in" | cut -d" " -f1 > tmp/lastlog.list
-diff -au data/lastlog.list tmp/lastlog.list
-echo "OK."
-
-rm -f tmp/lastlog.out tmp/lastlog.list
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/log/lastlog/04_lastlog_mulitple/login.exp b/tests/log/lastlog/04_lastlog_mulitple/login.exp
deleted file mode 100755
index 664f919e..00000000
--- a/tests/log/lastlog/04_lastlog_mulitple/login.exp
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/expect
-
-if {$argc == 1} {
-        set user     [lindex $argv 0]
-} else {
-        set user     "foo"
-}
-
-set timeout 2
-expect_after default {puts "\nFAIL"; exit 1}
-
-spawn /bin/bash
-expect "# "
-
-send "login -f $user\r"
-expect "$ "
-
-send "exit\r"
-exit 0
diff --git a/tests/log/lastlog/05_lastlog-u_ID/config.txt b/tests/log/lastlog/05_lastlog-u_ID/config.txt
deleted file mode 100644
index 1a78b6cd..00000000
--- a/tests/log/lastlog/05_lastlog-u_ID/config.txt
+++ /dev/null
@@ -1 +0,0 @@
-user foo exists, UID 1000
diff --git a/tests/log/lastlog/05_lastlog-u_ID/config/etc/group b/tests/log/lastlog/05_lastlog-u_ID/config/etc/group
deleted file mode 100644
index b6fae894..00000000
--- a/tests/log/lastlog/05_lastlog-u_ID/config/etc/group
+++ /dev/null
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root,foo
-tty:x:5:
-disk:x:6:
-lp:x:7:foo,root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:foo
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:foo
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:foo
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:
diff --git a/tests/log/lastlog/05_lastlog-u_ID/config/etc/gshadow b/tests/log/lastlog/05_lastlog-u_ID/config/etc/gshadow
deleted file mode 100644
index 1f2ba8da..00000000
--- a/tests/log/lastlog/05_lastlog-u_ID/config/etc/gshadow
+++ /dev/null
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root,foo
-tty:*::foo
-disk:*:foo:
-lp:*::foo,root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*:foo:foo
-voice:*::
-cdrom:*:foo:foo
-floppy:*::foo
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-foo:*::
diff --git a/tests/log/lastlog/05_lastlog-u_ID/config/etc/passwd b/tests/log/lastlog/05_lastlog-u_ID/config/etc/passwd
deleted file mode 100644
index 9d34d3af..00000000
--- a/tests/log/lastlog/05_lastlog-u_ID/config/etc/passwd
+++ /dev/null
@@ -1,22 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-bar:x:1001:1001::/home/bar:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-foo:x:1000:1000::/home/foo:/bin/sh
-baz:x:1002:1002::/home/baz:/bin/sh
diff --git a/tests/log/lastlog/05_lastlog-u_ID/config/etc/shadow b/tests/log/lastlog/05_lastlog-u_ID/config/etc/shadow
deleted file mode 100644
index 972f2cd0..00000000
--- a/tests/log/lastlog/05_lastlog-u_ID/config/etc/shadow
+++ /dev/null
@@ -1,22 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-bar:!:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::
-baz:!:12977:0:99999:7:::
diff --git a/tests/log/lastlog/05_lastlog-u_ID/data/lastlog.list b/tests/log/lastlog/05_lastlog-u_ID/data/lastlog.list
deleted file mode 100644
index aa542b81..00000000
--- a/tests/log/lastlog/05_lastlog-u_ID/data/lastlog.list
+++ /dev/null
@@ -1,2 +0,0 @@
-Username
-bar
diff --git a/tests/log/lastlog/05_lastlog-u_ID/lastlog.test b/tests/log/lastlog/05_lastlog-u_ID/lastlog.test
deleted file mode 100755
index b1de502b..00000000
--- a/tests/log/lastlog/05_lastlog-u_ID/lastlog.test
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../../common/config.sh
-. ../../../common/log.sh
-
-log_start "$0" "reports all entry from /var/log/lastlog"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Create an empty /var/log/lastlog (it will not be restored)..."
-> /var/log/lastlog
-echo "OK"
-
-echo -n "lastlog -u 1001..."
-lastlog -u 1001> tmp/lastlog.out
-echo "OK."
-
-echo "lastlog :"
-echo "======================================================================="
-cat tmp/lastlog.out
-echo "======================================================================="
-
-echo -n "Check the list of logged in users..."
-cat tmp/lastlog.out | cut -d" " -f1 > tmp/lastlog.list
-diff -au data/lastlog.list tmp/lastlog.list
-echo "OK."
-
-rm -f tmp/lastlog.out tmp/lastlog.list
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/log/lastlog/06_lastlog-u_name/config.txt b/tests/log/lastlog/06_lastlog-u_name/config.txt
deleted file mode 100644
index 1a78b6cd..00000000
--- a/tests/log/lastlog/06_lastlog-u_name/config.txt
+++ /dev/null
@@ -1 +0,0 @@
-user foo exists, UID 1000
diff --git a/tests/log/lastlog/06_lastlog-u_name/config/etc/group b/tests/log/lastlog/06_lastlog-u_name/config/etc/group
deleted file mode 100644
index b6fae894..00000000
--- a/tests/log/lastlog/06_lastlog-u_name/config/etc/group
+++ /dev/null
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root,foo
-tty:x:5:
-disk:x:6:
-lp:x:7:foo,root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:foo
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:foo
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:foo
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:
diff --git a/tests/log/lastlog/06_lastlog-u_name/config/etc/gshadow b/tests/log/lastlog/06_lastlog-u_name/config/etc/gshadow
deleted file mode 100644
index 1f2ba8da..00000000
--- a/tests/log/lastlog/06_lastlog-u_name/config/etc/gshadow
+++ /dev/null
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root,foo
-tty:*::foo
-disk:*:foo:
-lp:*::foo,root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*:foo:foo
-voice:*::
-cdrom:*:foo:foo
-floppy:*::foo
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-foo:*::
diff --git a/tests/log/lastlog/06_lastlog-u_name/config/etc/passwd b/tests/log/lastlog/06_lastlog-u_name/config/etc/passwd
deleted file mode 100644
index 9d34d3af..00000000
--- a/tests/log/lastlog/06_lastlog-u_name/config/etc/passwd
+++ /dev/null
@@ -1,22 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-bar:x:1001:1001::/home/bar:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-foo:x:1000:1000::/home/foo:/bin/sh
-baz:x:1002:1002::/home/baz:/bin/sh
diff --git a/tests/log/lastlog/06_lastlog-u_name/config/etc/shadow b/tests/log/lastlog/06_lastlog-u_name/config/etc/shadow
deleted file mode 100644
index 972f2cd0..00000000
--- a/tests/log/lastlog/06_lastlog-u_name/config/etc/shadow
+++ /dev/null
@@ -1,22 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-bar:!:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::
-baz:!:12977:0:99999:7:::
diff --git a/tests/log/lastlog/06_lastlog-u_name/data/lastlog.list b/tests/log/lastlog/06_lastlog-u_name/data/lastlog.list
deleted file mode 100644
index f886a83f..00000000
--- a/tests/log/lastlog/06_lastlog-u_name/data/lastlog.list
+++ /dev/null
@@ -1,2 +0,0 @@
-Username
-baz
diff --git a/tests/log/lastlog/06_lastlog-u_name/lastlog.test b/tests/log/lastlog/06_lastlog-u_name/lastlog.test
deleted file mode 100755
index b17312a4..00000000
--- a/tests/log/lastlog/06_lastlog-u_name/lastlog.test
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../../common/config.sh
-. ../../../common/log.sh
-
-log_start "$0" "reports all entry from /var/log/lastlog"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Create an empty /var/log/lastlog (it will not be restored)..."
-> /var/log/lastlog
-echo "OK"
-
-echo -n "lastlog -u baz..."
-lastlog -u baz> tmp/lastlog.out
-echo "OK."
-
-echo "lastlog :"
-echo "======================================================================="
-cat tmp/lastlog.out
-echo "======================================================================="
-
-echo -n "Check the list of logged in users..."
-cat tmp/lastlog.out | cut -d" " -f1 > tmp/lastlog.list
-diff -au data/lastlog.list tmp/lastlog.list
-echo "OK."
-
-rm -f tmp/lastlog.out tmp/lastlog.list
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/log/lastlog/07_lastlog-u_ID_invalid/config.txt b/tests/log/lastlog/07_lastlog-u_ID_invalid/config.txt
deleted file mode 100644
index 1a78b6cd..00000000
--- a/tests/log/lastlog/07_lastlog-u_ID_invalid/config.txt
+++ /dev/null
@@ -1 +0,0 @@
-user foo exists, UID 1000
diff --git a/tests/log/lastlog/07_lastlog-u_ID_invalid/config/etc/group b/tests/log/lastlog/07_lastlog-u_ID_invalid/config/etc/group
deleted file mode 100644
index b6fae894..00000000
--- a/tests/log/lastlog/07_lastlog-u_ID_invalid/config/etc/group
+++ /dev/null
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root,foo
-tty:x:5:
-disk:x:6:
-lp:x:7:foo,root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:foo
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:foo
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:foo
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:
diff --git a/tests/log/lastlog/07_lastlog-u_ID_invalid/config/etc/gshadow b/tests/log/lastlog/07_lastlog-u_ID_invalid/config/etc/gshadow
deleted file mode 100644
index 1f2ba8da..00000000
--- a/tests/log/lastlog/07_lastlog-u_ID_invalid/config/etc/gshadow
+++ /dev/null
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root,foo
-tty:*::foo
-disk:*:foo:
-lp:*::foo,root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*:foo:foo
-voice:*::
-cdrom:*:foo:foo
-floppy:*::foo
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-foo:*::
diff --git a/tests/log/lastlog/07_lastlog-u_ID_invalid/config/etc/passwd b/tests/log/lastlog/07_lastlog-u_ID_invalid/config/etc/passwd
deleted file mode 100644
index 9d34d3af..00000000
--- a/tests/log/lastlog/07_lastlog-u_ID_invalid/config/etc/passwd
+++ /dev/null
@@ -1,22 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-bar:x:1001:1001::/home/bar:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-foo:x:1000:1000::/home/foo:/bin/sh
-baz:x:1002:1002::/home/baz:/bin/sh
diff --git a/tests/log/lastlog/07_lastlog-u_ID_invalid/config/etc/shadow b/tests/log/lastlog/07_lastlog-u_ID_invalid/config/etc/shadow
deleted file mode 100644
index 972f2cd0..00000000
--- a/tests/log/lastlog/07_lastlog-u_ID_invalid/config/etc/shadow
+++ /dev/null
@@ -1,22 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-bar:!:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::
-baz:!:12977:0:99999:7:::
diff --git a/tests/log/lastlog/07_lastlog-u_ID_invalid/data/lastlog.list b/tests/log/lastlog/07_lastlog-u_ID_invalid/data/lastlog.list
deleted file mode 100644
index e69de29b..00000000
--- a/tests/log/lastlog/07_lastlog-u_ID_invalid/data/lastlog.list
+++ /dev/null
diff --git a/tests/log/lastlog/07_lastlog-u_ID_invalid/lastlog.test b/tests/log/lastlog/07_lastlog-u_ID_invalid/lastlog.test
deleted file mode 100755
index 36d1a2a5..00000000
--- a/tests/log/lastlog/07_lastlog-u_ID_invalid/lastlog.test
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../../common/config.sh
-. ../../../common/log.sh
-
-log_start "$0" "reports all entry from /var/log/lastlog"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Create an empty /var/log/lastlog (it will not be restored)..."
-> /var/log/lastlog
-echo "OK"
-
-echo -n "lastlog -u 1003..."
-lastlog -u 1003> tmp/lastlog.out
-echo "OK."
-
-echo "lastlog :"
-echo "======================================================================="
-cat tmp/lastlog.out
-echo "======================================================================="
-
-echo -n "Check the list of logged in users..."
-diff -au data/lastlog.list tmp/lastlog.out
-echo "OK."
-
-rm -f tmp/lastlog.out
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/log/lastlog/08_lastlog-u_name_invalid/config.txt b/tests/log/lastlog/08_lastlog-u_name_invalid/config.txt
deleted file mode 100644
index 1a78b6cd..00000000
--- a/tests/log/lastlog/08_lastlog-u_name_invalid/config.txt
+++ /dev/null
@@ -1 +0,0 @@
-user foo exists, UID 1000
diff --git a/tests/log/lastlog/08_lastlog-u_name_invalid/config/etc/group b/tests/log/lastlog/08_lastlog-u_name_invalid/config/etc/group
deleted file mode 100644
index b6fae894..00000000
--- a/tests/log/lastlog/08_lastlog-u_name_invalid/config/etc/group
+++ /dev/null
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root,foo
-tty:x:5:
-disk:x:6:
-lp:x:7:foo,root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:foo
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:foo
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:foo
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:
diff --git a/tests/log/lastlog/08_lastlog-u_name_invalid/config/etc/gshadow b/tests/log/lastlog/08_lastlog-u_name_invalid/config/etc/gshadow
deleted file mode 100644
index 1f2ba8da..00000000
--- a/tests/log/lastlog/08_lastlog-u_name_invalid/config/etc/gshadow
+++ /dev/null
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root,foo
-tty:*::foo
-disk:*:foo:
-lp:*::foo,root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*:foo:foo
-voice:*::
-cdrom:*:foo:foo
-floppy:*::foo
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-foo:*::
diff --git a/tests/log/lastlog/08_lastlog-u_name_invalid/config/etc/passwd b/tests/log/lastlog/08_lastlog-u_name_invalid/config/etc/passwd
deleted file mode 100644
index 9d34d3af..00000000
--- a/tests/log/lastlog/08_lastlog-u_name_invalid/config/etc/passwd
+++ /dev/null
@@ -1,22 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-bar:x:1001:1001::/home/bar:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-foo:x:1000:1000::/home/foo:/bin/sh
-baz:x:1002:1002::/home/baz:/bin/sh
diff --git a/tests/log/lastlog/08_lastlog-u_name_invalid/config/etc/shadow b/tests/log/lastlog/08_lastlog-u_name_invalid/config/etc/shadow
deleted file mode 100644
index 972f2cd0..00000000
--- a/tests/log/lastlog/08_lastlog-u_name_invalid/config/etc/shadow
+++ /dev/null
@@ -1,22 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-bar:!:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::
-baz:!:12977:0:99999:7:::
diff --git a/tests/log/lastlog/08_lastlog-u_name_invalid/data/lastlog.err b/tests/log/lastlog/08_lastlog-u_name_invalid/data/lastlog.err
deleted file mode 100644
index c604c0e1..00000000
--- a/tests/log/lastlog/08_lastlog-u_name_invalid/data/lastlog.err
+++ /dev/null
@@ -1 +0,0 @@
-lastlog: Unknown user or range: me
diff --git a/tests/log/lastlog/08_lastlog-u_name_invalid/lastlog.test b/tests/log/lastlog/08_lastlog-u_name_invalid/lastlog.test
deleted file mode 100755
index 66fdad0c..00000000
--- a/tests/log/lastlog/08_lastlog-u_name_invalid/lastlog.test
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../../common/config.sh
-. ../../../common/log.sh
-
-log_start "$0" "reports all entry from /var/log/lastlog"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Create an empty /var/log/lastlog (it will not be restored)..."
-> /var/log/lastlog
-echo "OK"
-
-echo -n "lastlog -u me..."
-lastlog -u me 2>tmp/lastlog.err && exit 1 || {
-	status=$?
-}
-echo "OK."
-
-echo -n "Check returned status ($status)..."
-test "$status" = "1"
-echo "OK"
-
-echo "lastlog reported:"
-echo "======================================================================="
-cat tmp/lastlog.err
-echo "======================================================================="
-echo -n "Check the usage message..."
-diff -au data/lastlog.err tmp/lastlog.err
-echo "message OK."
-rm -f tmp/lastlog.err
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/log/lastlog/09_lastlog-u_range/config.txt b/tests/log/lastlog/09_lastlog-u_range/config.txt
deleted file mode 100644
index 1a78b6cd..00000000
--- a/tests/log/lastlog/09_lastlog-u_range/config.txt
+++ /dev/null
@@ -1 +0,0 @@
-user foo exists, UID 1000
diff --git a/tests/log/lastlog/09_lastlog-u_range/config/etc/group b/tests/log/lastlog/09_lastlog-u_range/config/etc/group
deleted file mode 100644
index b6fae894..00000000
--- a/tests/log/lastlog/09_lastlog-u_range/config/etc/group
+++ /dev/null
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root,foo
-tty:x:5:
-disk:x:6:
-lp:x:7:foo,root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:foo
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:foo
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:foo
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:
diff --git a/tests/log/lastlog/09_lastlog-u_range/config/etc/gshadow b/tests/log/lastlog/09_lastlog-u_range/config/etc/gshadow
deleted file mode 100644
index 1f2ba8da..00000000
--- a/tests/log/lastlog/09_lastlog-u_range/config/etc/gshadow
+++ /dev/null
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root,foo
-tty:*::foo
-disk:*:foo:
-lp:*::foo,root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*:foo:foo
-voice:*::
-cdrom:*:foo:foo
-floppy:*::foo
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-foo:*::
diff --git a/tests/log/lastlog/09_lastlog-u_range/config/etc/passwd b/tests/log/lastlog/09_lastlog-u_range/config/etc/passwd
deleted file mode 100644
index 9d34d3af..00000000
--- a/tests/log/lastlog/09_lastlog-u_range/config/etc/passwd
+++ /dev/null
@@ -1,22 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-bar:x:1001:1001::/home/bar:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-foo:x:1000:1000::/home/foo:/bin/sh
-baz:x:1002:1002::/home/baz:/bin/sh
diff --git a/tests/log/lastlog/09_lastlog-u_range/config/etc/shadow b/tests/log/lastlog/09_lastlog-u_range/config/etc/shadow
deleted file mode 100644
index 972f2cd0..00000000
--- a/tests/log/lastlog/09_lastlog-u_range/config/etc/shadow
+++ /dev/null
@@ -1,22 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-bar:!:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::
-baz:!:12977:0:99999:7:::
diff --git a/tests/log/lastlog/09_lastlog-u_range/data/lastlog.list b/tests/log/lastlog/09_lastlog-u_range/data/lastlog.list
deleted file mode 100644
index 0d06c77b..00000000
--- a/tests/log/lastlog/09_lastlog-u_range/data/lastlog.list
+++ /dev/null
@@ -1,7 +0,0 @@
-Username
-bar
-list
-irc
-gnats
-Debian-exim
-foo
diff --git a/tests/log/lastlog/09_lastlog-u_range/lastlog.test b/tests/log/lastlog/09_lastlog-u_range/lastlog.test
deleted file mode 100755
index 232d0884..00000000
--- a/tests/log/lastlog/09_lastlog-u_range/lastlog.test
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../../common/config.sh
-. ../../../common/log.sh
-
-log_start "$0" "reports all entry from /var/log/lastlog"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Create an empty /var/log/lastlog (it will not be restored)..."
-> /var/log/lastlog
-echo "OK"
-
-echo -n "lastlog -u 38-1001..."
-lastlog -u 38-1001> tmp/lastlog.out
-echo "OK."
-
-echo "lastlog :"
-echo "======================================================================="
-cat tmp/lastlog.out
-echo "======================================================================="
-
-echo -n "Check the list of logged in users..."
-cat tmp/lastlog.out | cut -d" " -f1 > tmp/lastlog.list
-diff -au data/lastlog.list tmp/lastlog.list
-echo "OK."
-
-rm -f tmp/lastlog.out tmp/lastlog.list
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/log/lastlog/10_lastlog-u_open_range/config.txt b/tests/log/lastlog/10_lastlog-u_open_range/config.txt
deleted file mode 100644
index 1a78b6cd..00000000
--- a/tests/log/lastlog/10_lastlog-u_open_range/config.txt
+++ /dev/null
@@ -1 +0,0 @@
-user foo exists, UID 1000
diff --git a/tests/log/lastlog/10_lastlog-u_open_range/config/etc/group b/tests/log/lastlog/10_lastlog-u_open_range/config/etc/group
deleted file mode 100644
index b6fae894..00000000
--- a/tests/log/lastlog/10_lastlog-u_open_range/config/etc/group
+++ /dev/null
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root,foo
-tty:x:5:
-disk:x:6:
-lp:x:7:foo,root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:foo
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:foo
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:foo
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:
diff --git a/tests/log/lastlog/10_lastlog-u_open_range/config/etc/gshadow b/tests/log/lastlog/10_lastlog-u_open_range/config/etc/gshadow
deleted file mode 100644
index 1f2ba8da..00000000
--- a/tests/log/lastlog/10_lastlog-u_open_range/config/etc/gshadow
+++ /dev/null
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root,foo
-tty:*::foo
-disk:*:foo:
-lp:*::foo,root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*:foo:foo
-voice:*::
-cdrom:*:foo:foo
-floppy:*::foo
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-foo:*::
diff --git a/tests/log/lastlog/10_lastlog-u_open_range/config/etc/passwd b/tests/log/lastlog/10_lastlog-u_open_range/config/etc/passwd
deleted file mode 100644
index 9d34d3af..00000000
--- a/tests/log/lastlog/10_lastlog-u_open_range/config/etc/passwd
+++ /dev/null
@@ -1,22 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-bar:x:1001:1001::/home/bar:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-foo:x:1000:1000::/home/foo:/bin/sh
-baz:x:1002:1002::/home/baz:/bin/sh
diff --git a/tests/log/lastlog/10_lastlog-u_open_range/config/etc/shadow b/tests/log/lastlog/10_lastlog-u_open_range/config/etc/shadow
deleted file mode 100644
index 972f2cd0..00000000
--- a/tests/log/lastlog/10_lastlog-u_open_range/config/etc/shadow
+++ /dev/null
@@ -1,22 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-bar:!:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::
-baz:!:12977:0:99999:7:::
diff --git a/tests/log/lastlog/10_lastlog-u_open_range/data/lastlog.list b/tests/log/lastlog/10_lastlog-u_open_range/data/lastlog.list
deleted file mode 100644
index 692874a8..00000000
--- a/tests/log/lastlog/10_lastlog-u_open_range/data/lastlog.list
+++ /dev/null
@@ -1,21 +0,0 @@
-Username
-root
-daemon
-bin
-bar
-sys
-sync
-games
-man
-lp
-mail
-news
-uucp
-proxy
-www-data
-backup
-list
-irc
-gnats
-Debian-exim
-foo
diff --git a/tests/log/lastlog/10_lastlog-u_open_range/lastlog.test b/tests/log/lastlog/10_lastlog-u_open_range/lastlog.test
deleted file mode 100755
index 5bc3d6b7..00000000
--- a/tests/log/lastlog/10_lastlog-u_open_range/lastlog.test
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../../common/config.sh
-. ../../../common/log.sh
-
-log_start "$0" "lastlog supports open ranges"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Create an empty /var/log/lastlog (it will not be restored)..."
-> /var/log/lastlog
-echo "OK"
-
-echo -n "lastlog -u -1001..."
-lastlog -u -1001> tmp/lastlog.out
-echo "OK."
-
-echo "lastlog :"
-echo "======================================================================="
-cat tmp/lastlog.out
-echo "======================================================================="
-
-echo -n "Check the list of logged in users..."
-cat tmp/lastlog.out | cut -d" " -f1 > tmp/lastlog.list
-diff -au data/lastlog.list tmp/lastlog.list
-echo "OK."
-
-rm -f tmp/lastlog.out tmp/lastlog.list
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/log/lastlog/11_lastlog-u_range_open/config.txt b/tests/log/lastlog/11_lastlog-u_range_open/config.txt
deleted file mode 100644
index 1a78b6cd..00000000
--- a/tests/log/lastlog/11_lastlog-u_range_open/config.txt
+++ /dev/null
@@ -1 +0,0 @@
-user foo exists, UID 1000
diff --git a/tests/log/lastlog/11_lastlog-u_range_open/config/etc/group b/tests/log/lastlog/11_lastlog-u_range_open/config/etc/group
deleted file mode 100644
index b6fae894..00000000
--- a/tests/log/lastlog/11_lastlog-u_range_open/config/etc/group
+++ /dev/null
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root,foo
-tty:x:5:
-disk:x:6:
-lp:x:7:foo,root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:foo
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:foo
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:foo
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:
diff --git a/tests/log/lastlog/11_lastlog-u_range_open/config/etc/gshadow b/tests/log/lastlog/11_lastlog-u_range_open/config/etc/gshadow
deleted file mode 100644
index 1f2ba8da..00000000
--- a/tests/log/lastlog/11_lastlog-u_range_open/config/etc/gshadow
+++ /dev/null
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root,foo
-tty:*::foo
-disk:*:foo:
-lp:*::foo,root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*:foo:foo
-voice:*::
-cdrom:*:foo:foo
-floppy:*::foo
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-foo:*::
diff --git a/tests/log/lastlog/11_lastlog-u_range_open/config/etc/passwd b/tests/log/lastlog/11_lastlog-u_range_open/config/etc/passwd
deleted file mode 100644
index 9d34d3af..00000000
--- a/tests/log/lastlog/11_lastlog-u_range_open/config/etc/passwd
+++ /dev/null
@@ -1,22 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-bar:x:1001:1001::/home/bar:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-foo:x:1000:1000::/home/foo:/bin/sh
-baz:x:1002:1002::/home/baz:/bin/sh
diff --git a/tests/log/lastlog/11_lastlog-u_range_open/config/etc/shadow b/tests/log/lastlog/11_lastlog-u_range_open/config/etc/shadow
deleted file mode 100644
index 972f2cd0..00000000
--- a/tests/log/lastlog/11_lastlog-u_range_open/config/etc/shadow
+++ /dev/null
@@ -1,22 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-bar:!:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::
-baz:!:12977:0:99999:7:::
diff --git a/tests/log/lastlog/11_lastlog-u_range_open/data/lastlog.list b/tests/log/lastlog/11_lastlog-u_range_open/data/lastlog.list
deleted file mode 100644
index 4ad4379d..00000000
--- a/tests/log/lastlog/11_lastlog-u_range_open/data/lastlog.list
+++ /dev/null
@@ -1,9 +0,0 @@
-Username
-bar
-list
-irc
-gnats
-nobody
-Debian-exim
-foo
-baz
diff --git a/tests/log/lastlog/11_lastlog-u_range_open/lastlog.test b/tests/log/lastlog/11_lastlog-u_range_open/lastlog.test
deleted file mode 100755
index ab36308b..00000000
--- a/tests/log/lastlog/11_lastlog-u_range_open/lastlog.test
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../../common/config.sh
-. ../../../common/log.sh
-
-log_start "$0" "lastlog supports open ranges (2)"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Create an empty /var/log/lastlog (it will not be restored)..."
-> /var/log/lastlog
-echo "OK"
-
-echo -n "lastlog -u 38-..."
-lastlog -u 38-> tmp/lastlog.out
-echo "OK."
-
-echo "lastlog :"
-echo "======================================================================="
-cat tmp/lastlog.out
-echo "======================================================================="
-
-echo -n "Check the list of logged in users..."
-cat tmp/lastlog.out | cut -d" " -f1 > tmp/lastlog.list
-diff -au data/lastlog.list tmp/lastlog.list
-echo "OK."
-
-rm -f tmp/lastlog.out tmp/lastlog.list
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/log/lastlog/12_lastlog-u_range_invalid1/config.txt b/tests/log/lastlog/12_lastlog-u_range_invalid1/config.txt
deleted file mode 100644
index 1a78b6cd..00000000
--- a/tests/log/lastlog/12_lastlog-u_range_invalid1/config.txt
+++ /dev/null
@@ -1 +0,0 @@
-user foo exists, UID 1000
diff --git a/tests/log/lastlog/12_lastlog-u_range_invalid1/config/etc/group b/tests/log/lastlog/12_lastlog-u_range_invalid1/config/etc/group
deleted file mode 100644
index b6fae894..00000000
--- a/tests/log/lastlog/12_lastlog-u_range_invalid1/config/etc/group
+++ /dev/null
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root,foo
-tty:x:5:
-disk:x:6:
-lp:x:7:foo,root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:foo
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:foo
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:foo
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:
diff --git a/tests/log/lastlog/12_lastlog-u_range_invalid1/config/etc/gshadow b/tests/log/lastlog/12_lastlog-u_range_invalid1/config/etc/gshadow
deleted file mode 100644
index 1f2ba8da..00000000
--- a/tests/log/lastlog/12_lastlog-u_range_invalid1/config/etc/gshadow
+++ /dev/null
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root,foo
-tty:*::foo
-disk:*:foo:
-lp:*::foo,root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*:foo:foo
-voice:*::
-cdrom:*:foo:foo
-floppy:*::foo
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-foo:*::
diff --git a/tests/log/lastlog/12_lastlog-u_range_invalid1/config/etc/passwd b/tests/log/lastlog/12_lastlog-u_range_invalid1/config/etc/passwd
deleted file mode 100644
index 9d34d3af..00000000
--- a/tests/log/lastlog/12_lastlog-u_range_invalid1/config/etc/passwd
+++ /dev/null
@@ -1,22 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-bar:x:1001:1001::/home/bar:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-foo:x:1000:1000::/home/foo:/bin/sh
-baz:x:1002:1002::/home/baz:/bin/sh
diff --git a/tests/log/lastlog/12_lastlog-u_range_invalid1/config/etc/shadow b/tests/log/lastlog/12_lastlog-u_range_invalid1/config/etc/shadow
deleted file mode 100644
index 972f2cd0..00000000
--- a/tests/log/lastlog/12_lastlog-u_range_invalid1/config/etc/shadow
+++ /dev/null
@@ -1,22 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-bar:!:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::
-baz:!:12977:0:99999:7:::
diff --git a/tests/log/lastlog/12_lastlog-u_range_invalid1/data/lastlog.err b/tests/log/lastlog/12_lastlog-u_range_invalid1/data/lastlog.err
deleted file mode 100644
index 13416079..00000000
--- a/tests/log/lastlog/12_lastlog-u_range_invalid1/data/lastlog.err
+++ /dev/null
@@ -1 +0,0 @@
-lastlog: Unknown user or range: foo-bar
diff --git a/tests/log/lastlog/12_lastlog-u_range_invalid1/lastlog.test b/tests/log/lastlog/12_lastlog-u_range_invalid1/lastlog.test
deleted file mode 100755
index 85879b27..00000000
--- a/tests/log/lastlog/12_lastlog-u_range_invalid1/lastlog.test
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../../common/config.sh
-. ../../../common/log.sh
-
-log_start "$0" "reports invalid ranges"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Create an empty /var/log/lastlog (it will not be restored)..."
-> /var/log/lastlog
-echo "OK"
-
-echo -n "lastlog -u foo-bar..."
-lastlog -u foo-bar 2>tmp/lastlog.err && exit 1 || {
-	status=$?
-}
-echo "OK."
-
-echo -n "Check returned status ($status)..."
-test "$status" = "1"
-echo "OK"
-
-echo "lastlog reported:"
-echo "======================================================================="
-cat tmp/lastlog.err
-echo "======================================================================="
-echo -n "Check the usage message..."
-diff -au data/lastlog.err tmp/lastlog.err
-echo "message OK."
-rm -f tmp/lastlog.err
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/log/lastlog/13_lastlog-u_range_invalid2/config.txt b/tests/log/lastlog/13_lastlog-u_range_invalid2/config.txt
deleted file mode 100644
index 1a78b6cd..00000000
--- a/tests/log/lastlog/13_lastlog-u_range_invalid2/config.txt
+++ /dev/null
@@ -1 +0,0 @@
-user foo exists, UID 1000
diff --git a/tests/log/lastlog/13_lastlog-u_range_invalid2/config/etc/group b/tests/log/lastlog/13_lastlog-u_range_invalid2/config/etc/group
deleted file mode 100644
index b6fae894..00000000
--- a/tests/log/lastlog/13_lastlog-u_range_invalid2/config/etc/group
+++ /dev/null
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root,foo
-tty:x:5:
-disk:x:6:
-lp:x:7:foo,root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:foo
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:foo
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:foo
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:
diff --git a/tests/log/lastlog/13_lastlog-u_range_invalid2/config/etc/gshadow b/tests/log/lastlog/13_lastlog-u_range_invalid2/config/etc/gshadow
deleted file mode 100644
index 1f2ba8da..00000000
--- a/tests/log/lastlog/13_lastlog-u_range_invalid2/config/etc/gshadow
+++ /dev/null
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root,foo
-tty:*::foo
-disk:*:foo:
-lp:*::foo,root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*:foo:foo
-voice:*::
-cdrom:*:foo:foo
-floppy:*::foo
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-foo:*::
diff --git a/tests/log/lastlog/13_lastlog-u_range_invalid2/config/etc/passwd b/tests/log/lastlog/13_lastlog-u_range_invalid2/config/etc/passwd
deleted file mode 100644
index 9d34d3af..00000000
--- a/tests/log/lastlog/13_lastlog-u_range_invalid2/config/etc/passwd
+++ /dev/null
@@ -1,22 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-bar:x:1001:1001::/home/bar:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-foo:x:1000:1000::/home/foo:/bin/sh
-baz:x:1002:1002::/home/baz:/bin/sh
diff --git a/tests/log/lastlog/13_lastlog-u_range_invalid2/config/etc/shadow b/tests/log/lastlog/13_lastlog-u_range_invalid2/config/etc/shadow
deleted file mode 100644
index 972f2cd0..00000000
--- a/tests/log/lastlog/13_lastlog-u_range_invalid2/config/etc/shadow
+++ /dev/null
@@ -1,22 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-bar:!:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::
-baz:!:12977:0:99999:7:::
diff --git a/tests/log/lastlog/13_lastlog-u_range_invalid2/data/lastlog.err b/tests/log/lastlog/13_lastlog-u_range_invalid2/data/lastlog.err
deleted file mode 100644
index cff222b2..00000000
--- a/tests/log/lastlog/13_lastlog-u_range_invalid2/data/lastlog.err
+++ /dev/null
@@ -1 +0,0 @@
-lastlog: Unknown user or range: foo-
diff --git a/tests/log/lastlog/13_lastlog-u_range_invalid2/lastlog.test b/tests/log/lastlog/13_lastlog-u_range_invalid2/lastlog.test
deleted file mode 100755
index 6d6d09b3..00000000
--- a/tests/log/lastlog/13_lastlog-u_range_invalid2/lastlog.test
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../../common/config.sh
-. ../../../common/log.sh
-
-log_start "$0" "reports invalid ranges"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Create an empty /var/log/lastlog (it will not be restored)..."
-> /var/log/lastlog
-echo "OK"
-
-echo -n "lastlog -u foo-..."
-lastlog -u foo- 2>tmp/lastlog.err && exit 1 || {
-	status=$?
-}
-echo "OK."
-
-echo -n "Check returned status ($status)..."
-test "$status" = "1"
-echo "OK"
-
-echo "lastlog reported:"
-echo "======================================================================="
-cat tmp/lastlog.err
-echo "======================================================================="
-echo -n "Check the usage message..."
-diff -au data/lastlog.err tmp/lastlog.err
-echo "message OK."
-rm -f tmp/lastlog.err
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/log/lastlog/14_lastlog-u_range_invalid3/config.txt b/tests/log/lastlog/14_lastlog-u_range_invalid3/config.txt
deleted file mode 100644
index 1a78b6cd..00000000
--- a/tests/log/lastlog/14_lastlog-u_range_invalid3/config.txt
+++ /dev/null
@@ -1 +0,0 @@
-user foo exists, UID 1000
diff --git a/tests/log/lastlog/14_lastlog-u_range_invalid3/config/etc/group b/tests/log/lastlog/14_lastlog-u_range_invalid3/config/etc/group
deleted file mode 100644
index b6fae894..00000000
--- a/tests/log/lastlog/14_lastlog-u_range_invalid3/config/etc/group
+++ /dev/null
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root,foo
-tty:x:5:
-disk:x:6:
-lp:x:7:foo,root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:foo
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:foo
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:foo
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:
diff --git a/tests/log/lastlog/14_lastlog-u_range_invalid3/config/etc/gshadow b/tests/log/lastlog/14_lastlog-u_range_invalid3/config/etc/gshadow
deleted file mode 100644
index 1f2ba8da..00000000
--- a/tests/log/lastlog/14_lastlog-u_range_invalid3/config/etc/gshadow
+++ /dev/null
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root,foo
-tty:*::foo
-disk:*:foo:
-lp:*::foo,root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*:foo:foo
-voice:*::
-cdrom:*:foo:foo
-floppy:*::foo
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-foo:*::
diff --git a/tests/log/lastlog/14_lastlog-u_range_invalid3/config/etc/passwd b/tests/log/lastlog/14_lastlog-u_range_invalid3/config/etc/passwd
deleted file mode 100644
index 9d34d3af..00000000
--- a/tests/log/lastlog/14_lastlog-u_range_invalid3/config/etc/passwd
+++ /dev/null
@@ -1,22 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-bar:x:1001:1001::/home/bar:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-foo:x:1000:1000::/home/foo:/bin/sh
-baz:x:1002:1002::/home/baz:/bin/sh
diff --git a/tests/log/lastlog/14_lastlog-u_range_invalid3/config/etc/shadow b/tests/log/lastlog/14_lastlog-u_range_invalid3/config/etc/shadow
deleted file mode 100644
index 972f2cd0..00000000
--- a/tests/log/lastlog/14_lastlog-u_range_invalid3/config/etc/shadow
+++ /dev/null
@@ -1,22 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-bar:!:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::
-baz:!:12977:0:99999:7:::
diff --git a/tests/log/lastlog/14_lastlog-u_range_invalid3/data/lastlog.err b/tests/log/lastlog/14_lastlog-u_range_invalid3/data/lastlog.err
deleted file mode 100644
index 999f9a20..00000000
--- a/tests/log/lastlog/14_lastlog-u_range_invalid3/data/lastlog.err
+++ /dev/null
@@ -1 +0,0 @@
-lastlog: Unknown user or range: -foo
diff --git a/tests/log/lastlog/14_lastlog-u_range_invalid3/lastlog.test b/tests/log/lastlog/14_lastlog-u_range_invalid3/lastlog.test
deleted file mode 100755
index 6cd61ef2..00000000
--- a/tests/log/lastlog/14_lastlog-u_range_invalid3/lastlog.test
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../../common/config.sh
-. ../../../common/log.sh
-
-log_start "$0" "reports invalid ranges"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Create an empty /var/log/lastlog (it will not be restored)..."
-> /var/log/lastlog
-echo "OK"
-
-echo -n "lastlog -u -foo..."
-lastlog -u -foo 2>tmp/lastlog.err && exit 1 || {
-	status=$?
-}
-echo "OK."
-
-echo -n "Check returned status ($status)..."
-test "$status" = "1"
-echo "OK"
-
-echo "lastlog reported:"
-echo "======================================================================="
-cat tmp/lastlog.err
-echo "======================================================================="
-echo -n "Check the usage message..."
-diff -au data/lastlog.err tmp/lastlog.err
-echo "message OK."
-rm -f tmp/lastlog.err
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/log/lastlog/15_lastlog_bad_option/config.txt b/tests/log/lastlog/15_lastlog_bad_option/config.txt
deleted file mode 100644
index 31f56359..00000000
--- a/tests/log/lastlog/15_lastlog_bad_option/config.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# no testsuite password
-# root password: rootF00barbaz
-# myuser password: myuserF00barbaz
-
-user foo, in group users (only in /etc/group)
-user foo, in group tty (only in /etc/gshadow)
-user foo, in group floppy
-user foo, admin of group disk
-user foo, admin and member of group fax
-user foo, admin and member of group cdrom (only in /etc/gshadow)
diff --git a/tests/log/lastlog/15_lastlog_bad_option/config/etc/group b/tests/log/lastlog/15_lastlog_bad_option/config/etc/group
deleted file mode 100644
index 10123908..00000000
--- a/tests/log/lastlog/15_lastlog_bad_option/config/etc/group
+++ /dev/null
@@ -1,41 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:
-adm:x:4:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
diff --git a/tests/log/lastlog/15_lastlog_bad_option/config/etc/gshadow b/tests/log/lastlog/15_lastlog_bad_option/config/etc/gshadow
deleted file mode 100644
index ae424865..00000000
--- a/tests/log/lastlog/15_lastlog_bad_option/config/etc/gshadow
+++ /dev/null
@@ -1,41 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::
-adm:*::
-tty:*::
-disk:*::
-lp:*::
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*::
-voice:*::
-cdrom:*::
-floppy:*::
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
diff --git a/tests/log/lastlog/15_lastlog_bad_option/config/etc/passwd b/tests/log/lastlog/15_lastlog_bad_option/config/etc/passwd
deleted file mode 100644
index 43fc135a..00000000
--- a/tests/log/lastlog/15_lastlog_bad_option/config/etc/passwd
+++ /dev/null
@@ -1,19 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
diff --git a/tests/log/lastlog/15_lastlog_bad_option/config/etc/shadow b/tests/log/lastlog/15_lastlog_bad_option/config/etc/shadow
deleted file mode 100644
index 5f50d187..00000000
--- a/tests/log/lastlog/15_lastlog_bad_option/config/etc/shadow
+++ /dev/null
@@ -1,19 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
diff --git a/tests/log/lastlog/15_lastlog_bad_option/data/usage.out b/tests/log/lastlog/15_lastlog_bad_option/data/usage.out
deleted file mode 100644
index fe1385a7..00000000
--- a/tests/log/lastlog/15_lastlog_bad_option/data/usage.out
+++ /dev/null
@@ -1,10 +0,0 @@
-lastlog: invalid option -- 'Z'
-Usage: lastlog [options]
-
-Options:
-  -b, --before DAYS             print only lastlog records older than DAYS
-  -h, --help                    display this help message and exit
-  -R, --root CHROOT_DIR         directory to chroot into
-  -t, --time DAYS               print only lastlog records more recent than DAYS
-  -u, --user LOGIN              print lastlog record of the specified LOGIN
-
diff --git a/tests/log/lastlog/15_lastlog_bad_option/lastlog.test b/tests/log/lastlog/15_lastlog_bad_option/lastlog.test
deleted file mode 100755
index 9e56fe27..00000000
--- a/tests/log/lastlog/15_lastlog_bad_option/lastlog.test
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../../common/config.sh
-. ../../../common/log.sh
-
-log_start "$0" "lastlog can display its usage message"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Get lastlog usage (lastlog -Z)..."
-lastlog -Z 2>tmp/usage.out && exit 1 || {
-	status=$?
-}
-echo "OK"
-
-echo -n "Check returned status ($status)..."
-test "$status" = "1"
-echo "OK"
-
-echo "lastlog reported:"
-echo "======================================================================="
-cat tmp/usage.out
-echo "======================================================================="
-echo -n "Check the usage message..."
-diff -au data/usage.out tmp/usage.out
-echo "usage message OK."
-rm -f tmp/usage.out
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/log/lastlog/16_lastlog_extra_arg/config.txt b/tests/log/lastlog/16_lastlog_extra_arg/config.txt
deleted file mode 100644
index 31f56359..00000000
--- a/tests/log/lastlog/16_lastlog_extra_arg/config.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# no testsuite password
-# root password: rootF00barbaz
-# myuser password: myuserF00barbaz
-
-user foo, in group users (only in /etc/group)
-user foo, in group tty (only in /etc/gshadow)
-user foo, in group floppy
-user foo, admin of group disk
-user foo, admin and member of group fax
-user foo, admin and member of group cdrom (only in /etc/gshadow)
diff --git a/tests/log/lastlog/16_lastlog_extra_arg/config/etc/group b/tests/log/lastlog/16_lastlog_extra_arg/config/etc/group
deleted file mode 100644
index 10123908..00000000
--- a/tests/log/lastlog/16_lastlog_extra_arg/config/etc/group
+++ /dev/null
@@ -1,41 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:
-adm:x:4:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
diff --git a/tests/log/lastlog/16_lastlog_extra_arg/config/etc/gshadow b/tests/log/lastlog/16_lastlog_extra_arg/config/etc/gshadow
deleted file mode 100644
index ae424865..00000000
--- a/tests/log/lastlog/16_lastlog_extra_arg/config/etc/gshadow
+++ /dev/null
@@ -1,41 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::
-adm:*::
-tty:*::
-disk:*::
-lp:*::
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*::
-voice:*::
-cdrom:*::
-floppy:*::
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
diff --git a/tests/log/lastlog/16_lastlog_extra_arg/config/etc/passwd b/tests/log/lastlog/16_lastlog_extra_arg/config/etc/passwd
deleted file mode 100644
index 43fc135a..00000000
--- a/tests/log/lastlog/16_lastlog_extra_arg/config/etc/passwd
+++ /dev/null
@@ -1,19 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
diff --git a/tests/log/lastlog/16_lastlog_extra_arg/config/etc/shadow b/tests/log/lastlog/16_lastlog_extra_arg/config/etc/shadow
deleted file mode 100644
index 5f50d187..00000000
--- a/tests/log/lastlog/16_lastlog_extra_arg/config/etc/shadow
+++ /dev/null
@@ -1,19 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
diff --git a/tests/log/lastlog/16_lastlog_extra_arg/data/usage.out b/tests/log/lastlog/16_lastlog_extra_arg/data/usage.out
deleted file mode 100644
index ab3455bd..00000000
--- a/tests/log/lastlog/16_lastlog_extra_arg/data/usage.out
+++ /dev/null
@@ -1,10 +0,0 @@
-lastlog: unexpected argument: foo
-Usage: lastlog [options]
-
-Options:
-  -b, --before DAYS             print only lastlog records older than DAYS
-  -h, --help                    display this help message and exit
-  -R, --root CHROOT_DIR         directory to chroot into
-  -t, --time DAYS               print only lastlog records more recent than DAYS
-  -u, --user LOGIN              print lastlog record of the specified LOGIN
-
diff --git a/tests/log/lastlog/16_lastlog_extra_arg/lastlog.test b/tests/log/lastlog/16_lastlog_extra_arg/lastlog.test
deleted file mode 100755
index 387c2921..00000000
--- a/tests/log/lastlog/16_lastlog_extra_arg/lastlog.test
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../../common/config.sh
-. ../../../common/log.sh
-
-log_start "$0" "lastlog checks if there are extra arguments"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Get lastlog usage (lastlog foo)..."
-lastlog foo 2>tmp/usage.out && exit 1 || {
-	status=$?
-}
-echo "OK"
-
-echo -n "Check returned status ($status)..."
-test "$status" = "1"
-echo "OK"
-
-echo "lastlog reported:"
-echo "======================================================================="
-cat tmp/usage.out
-echo "======================================================================="
-echo -n "Check the usage message..."
-diff -au data/usage.out tmp/usage.out
-echo "usage message OK."
-rm -f tmp/usage.out
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/log/lastlog/17_lastlog-t/config.txt b/tests/log/lastlog/17_lastlog-t/config.txt
deleted file mode 100644
index 1a78b6cd..00000000
--- a/tests/log/lastlog/17_lastlog-t/config.txt
+++ /dev/null
@@ -1 +0,0 @@
-user foo exists, UID 1000
diff --git a/tests/log/lastlog/17_lastlog-t/config/etc/group b/tests/log/lastlog/17_lastlog-t/config/etc/group
deleted file mode 100644
index b6fae894..00000000
--- a/tests/log/lastlog/17_lastlog-t/config/etc/group
+++ /dev/null
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root,foo
-tty:x:5:
-disk:x:6:
-lp:x:7:foo,root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:foo
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:foo
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:foo
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:
diff --git a/tests/log/lastlog/17_lastlog-t/config/etc/gshadow b/tests/log/lastlog/17_lastlog-t/config/etc/gshadow
deleted file mode 100644
index 1f2ba8da..00000000
--- a/tests/log/lastlog/17_lastlog-t/config/etc/gshadow
+++ /dev/null
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root,foo
-tty:*::foo
-disk:*:foo:
-lp:*::foo,root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*:foo:foo
-voice:*::
-cdrom:*:foo:foo
-floppy:*::foo
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-foo:*::
diff --git a/tests/log/lastlog/17_lastlog-t/config/etc/passwd b/tests/log/lastlog/17_lastlog-t/config/etc/passwd
deleted file mode 100644
index 9d34d3af..00000000
--- a/tests/log/lastlog/17_lastlog-t/config/etc/passwd
+++ /dev/null
@@ -1,22 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-bar:x:1001:1001::/home/bar:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-foo:x:1000:1000::/home/foo:/bin/sh
-baz:x:1002:1002::/home/baz:/bin/sh
diff --git a/tests/log/lastlog/17_lastlog-t/config/etc/shadow b/tests/log/lastlog/17_lastlog-t/config/etc/shadow
deleted file mode 100644
index 972f2cd0..00000000
--- a/tests/log/lastlog/17_lastlog-t/config/etc/shadow
+++ /dev/null
@@ -1,22 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-bar:!:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::
-baz:!:12977:0:99999:7:::
diff --git a/tests/log/lastlog/17_lastlog-t/data/lastlog.list b/tests/log/lastlog/17_lastlog-t/data/lastlog.list
deleted file mode 100644
index f81812d5..00000000
--- a/tests/log/lastlog/17_lastlog-t/data/lastlog.list
+++ /dev/null
@@ -1,3 +0,0 @@
-Username
-bar
-foo
diff --git a/tests/log/lastlog/17_lastlog-t/lastlog.test b/tests/log/lastlog/17_lastlog-t/lastlog.test
deleted file mode 100755
index a000caee..00000000
--- a/tests/log/lastlog/17_lastlog-t/lastlog.test
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../../common/config.sh
-. ../../../common/log.sh
-
-log_start "$0" "reports all entry from /var/log/lastlog"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Create an empty /var/log/lastlog (it will not be restored)..."
-> /var/log/lastlog
-echo "OK"
-
-echo -n "Trigger a connection as foo..."
-LD_PRELOAD=../../../common/time_past.so PAST_DAYS=2 ./login.exp foo
-echo "OK"
-echo -n "Trigger a connection as bar..."
-./login.exp bar
-echo "OK"
-echo -n "Trigger a connection as baz..."
-LD_PRELOAD=../../../common/time_past.so PAST_DAYS=4 ./login.exp baz
-echo "OK"
-
-echo -n "lastlog..."
-lastlog -t 3 > tmp/lastlog.out
-echo "OK."
-
-echo "lastlog :"
-echo "======================================================================="
-cat tmp/lastlog.out
-echo "======================================================================="
-
-echo -n "Check the list of logged in users..."
-cat tmp/lastlog.out | cut -d" " -f1 > tmp/lastlog.list
-diff -au data/lastlog.list tmp/lastlog.list
-echo "OK."
-
-rm -f tmp/lastlog.out tmp/lastlog.list
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/log/lastlog/17_lastlog-t/login.exp b/tests/log/lastlog/17_lastlog-t/login.exp
deleted file mode 100755
index a0052334..00000000
--- a/tests/log/lastlog/17_lastlog-t/login.exp
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/expect
-
-if {$argc == 1} {
-        set user     [lindex $argv 0]
-} else {
-        set user     "foo"
-}
-
-set timeout 2
-expect_after default {puts "\nFAIL"; exit 1}
-
-spawn /bin/bash
-expect "# "
-
-send "login -p -f $user\r"
-expect "$ "
-
-send "exit\r"
-exit 0
diff --git a/tests/log/lastlog/18_lastlog-b/config.txt b/tests/log/lastlog/18_lastlog-b/config.txt
deleted file mode 100644
index 1a78b6cd..00000000
--- a/tests/log/lastlog/18_lastlog-b/config.txt
+++ /dev/null
@@ -1 +0,0 @@
-user foo exists, UID 1000
diff --git a/tests/log/lastlog/18_lastlog-b/config/etc/group b/tests/log/lastlog/18_lastlog-b/config/etc/group
deleted file mode 100644
index b6fae894..00000000
--- a/tests/log/lastlog/18_lastlog-b/config/etc/group
+++ /dev/null
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root,foo
-tty:x:5:
-disk:x:6:
-lp:x:7:foo,root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:foo
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:foo
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:foo
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:
diff --git a/tests/log/lastlog/18_lastlog-b/config/etc/gshadow b/tests/log/lastlog/18_lastlog-b/config/etc/gshadow
deleted file mode 100644
index 1f2ba8da..00000000
--- a/tests/log/lastlog/18_lastlog-b/config/etc/gshadow
+++ /dev/null
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root,foo
-tty:*::foo
-disk:*:foo:
-lp:*::foo,root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*:foo:foo
-voice:*::
-cdrom:*:foo:foo
-floppy:*::foo
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-foo:*::
diff --git a/tests/log/lastlog/18_lastlog-b/config/etc/passwd b/tests/log/lastlog/18_lastlog-b/config/etc/passwd
deleted file mode 100644
index 9d34d3af..00000000
--- a/tests/log/lastlog/18_lastlog-b/config/etc/passwd
+++ /dev/null
@@ -1,22 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-bar:x:1001:1001::/home/bar:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-foo:x:1000:1000::/home/foo:/bin/sh
-baz:x:1002:1002::/home/baz:/bin/sh
diff --git a/tests/log/lastlog/18_lastlog-b/config/etc/shadow b/tests/log/lastlog/18_lastlog-b/config/etc/shadow
deleted file mode 100644
index 972f2cd0..00000000
--- a/tests/log/lastlog/18_lastlog-b/config/etc/shadow
+++ /dev/null
@@ -1,22 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-bar:!:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::
-baz:!:12977:0:99999:7:::
diff --git a/tests/log/lastlog/18_lastlog-b/data/lastlog.list b/tests/log/lastlog/18_lastlog-b/data/lastlog.list
deleted file mode 100644
index 219b8dad..00000000
--- a/tests/log/lastlog/18_lastlog-b/data/lastlog.list
+++ /dev/null
@@ -1,21 +0,0 @@
-Username
-root
-daemon
-bin
-sys
-sync
-games
-man
-lp
-mail
-news
-uucp
-proxy
-www-data
-backup
-list
-irc
-gnats
-nobody
-Debian-exim
-baz
diff --git a/tests/log/lastlog/18_lastlog-b/lastlog.test b/tests/log/lastlog/18_lastlog-b/lastlog.test
deleted file mode 100755
index 17349a3c..00000000
--- a/tests/log/lastlog/18_lastlog-b/lastlog.test
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../../common/config.sh
-. ../../../common/log.sh
-
-log_start "$0" "reports all entry from /var/log/lastlog"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Create an empty /var/log/lastlog (it will not be restored)..."
-> /var/log/lastlog
-echo "OK"
-
-echo -n "Trigger a connection as foo..."
-LD_PRELOAD=../../../common/time_past.so PAST_DAYS=2 ./login.exp foo
-echo "OK"
-echo -n "Trigger a connection as bar..."
-./login.exp bar
-echo "OK"
-echo -n "Trigger a connection as baz..."
-LD_PRELOAD=../../../common/time_past.so PAST_DAYS=4 ./login.exp baz
-echo "OK"
-
-echo -n "lastlog..."
-lastlog -b 3 > tmp/lastlog.out
-echo "OK."
-
-echo "lastlog :"
-echo "======================================================================="
-cat tmp/lastlog.out
-echo "======================================================================="
-
-echo -n "Check the list of logged in users..."
-cat tmp/lastlog.out | cut -d" " -f1 > tmp/lastlog.list
-diff -au data/lastlog.list tmp/lastlog.list
-echo "OK."
-
-rm -f tmp/lastlog.out tmp/lastlog.list
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/log/lastlog/18_lastlog-b/login.exp b/tests/log/lastlog/18_lastlog-b/login.exp
deleted file mode 100755
index a0052334..00000000
--- a/tests/log/lastlog/18_lastlog-b/login.exp
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/expect
-
-if {$argc == 1} {
-        set user     [lindex $argv 0]
-} else {
-        set user     "foo"
-}
-
-set timeout 2
-expect_after default {puts "\nFAIL"; exit 1}
-
-spawn /bin/bash
-expect "# "
-
-send "login -p -f $user\r"
-expect "$ "
-
-send "exit\r"
-exit 0
diff --git a/tests/log/lastlog/19_lastlog-t_invalid/config.txt b/tests/log/lastlog/19_lastlog-t_invalid/config.txt
deleted file mode 100644
index 1a78b6cd..00000000
--- a/tests/log/lastlog/19_lastlog-t_invalid/config.txt
+++ /dev/null
@@ -1 +0,0 @@
-user foo exists, UID 1000
diff --git a/tests/log/lastlog/19_lastlog-t_invalid/config/etc/group b/tests/log/lastlog/19_lastlog-t_invalid/config/etc/group
deleted file mode 100644
index b6fae894..00000000
--- a/tests/log/lastlog/19_lastlog-t_invalid/config/etc/group
+++ /dev/null
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root,foo
-tty:x:5:
-disk:x:6:
-lp:x:7:foo,root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:foo
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:foo
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:foo
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:
diff --git a/tests/log/lastlog/19_lastlog-t_invalid/config/etc/gshadow b/tests/log/lastlog/19_lastlog-t_invalid/config/etc/gshadow
deleted file mode 100644
index 1f2ba8da..00000000
--- a/tests/log/lastlog/19_lastlog-t_invalid/config/etc/gshadow
+++ /dev/null
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root,foo
-tty:*::foo
-disk:*:foo:
-lp:*::foo,root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*:foo:foo
-voice:*::
-cdrom:*:foo:foo
-floppy:*::foo
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-foo:*::
diff --git a/tests/log/lastlog/19_lastlog-t_invalid/config/etc/passwd b/tests/log/lastlog/19_lastlog-t_invalid/config/etc/passwd
deleted file mode 100644
index 9d34d3af..00000000
--- a/tests/log/lastlog/19_lastlog-t_invalid/config/etc/passwd
+++ /dev/null
@@ -1,22 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-bar:x:1001:1001::/home/bar:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-foo:x:1000:1000::/home/foo:/bin/sh
-baz:x:1002:1002::/home/baz:/bin/sh
diff --git a/tests/log/lastlog/19_lastlog-t_invalid/config/etc/shadow b/tests/log/lastlog/19_lastlog-t_invalid/config/etc/shadow
deleted file mode 100644
index 972f2cd0..00000000
--- a/tests/log/lastlog/19_lastlog-t_invalid/config/etc/shadow
+++ /dev/null
@@ -1,22 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-bar:!:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::
-baz:!:12977:0:99999:7:::
diff --git a/tests/log/lastlog/19_lastlog-t_invalid/data/lastlog.err b/tests/log/lastlog/19_lastlog-t_invalid/data/lastlog.err
deleted file mode 100644
index 8197db74..00000000
--- a/tests/log/lastlog/19_lastlog-t_invalid/data/lastlog.err
+++ /dev/null
@@ -1 +0,0 @@
-lastlog: invalid numeric argument '-2'
diff --git a/tests/log/lastlog/19_lastlog-t_invalid/lastlog.test b/tests/log/lastlog/19_lastlog-t_invalid/lastlog.test
deleted file mode 100755
index 50f71b52..00000000
--- a/tests/log/lastlog/19_lastlog-t_invalid/lastlog.test
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../../common/config.sh
-. ../../../common/log.sh
-
-log_start "$0" "reports invalid ranges"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Create an empty /var/log/lastlog (it will not be restored)..."
-> /var/log/lastlog
-echo "OK"
-
-echo -n "lastlog -t -2..."
-lastlog -t -2 2>tmp/lastlog.err && exit 1 || {
-	status=$?
-}
-echo "OK."
-
-echo -n "Check returned status ($status)..."
-test "$status" = "1"
-echo "OK"
-
-echo "lastlog reported:"
-echo "======================================================================="
-cat tmp/lastlog.err
-echo "======================================================================="
-echo -n "Check the usage message..."
-diff -au data/lastlog.err tmp/lastlog.err
-echo "message OK."
-rm -f tmp/lastlog.err
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/log/lastlog/20_lastlog-b_invalid/config.txt b/tests/log/lastlog/20_lastlog-b_invalid/config.txt
deleted file mode 100644
index 1a78b6cd..00000000
--- a/tests/log/lastlog/20_lastlog-b_invalid/config.txt
+++ /dev/null
@@ -1 +0,0 @@
-user foo exists, UID 1000
diff --git a/tests/log/lastlog/20_lastlog-b_invalid/config/etc/group b/tests/log/lastlog/20_lastlog-b_invalid/config/etc/group
deleted file mode 100644
index b6fae894..00000000
--- a/tests/log/lastlog/20_lastlog-b_invalid/config/etc/group
+++ /dev/null
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root,foo
-tty:x:5:
-disk:x:6:
-lp:x:7:foo,root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:foo
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:foo
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:foo
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:
diff --git a/tests/log/lastlog/20_lastlog-b_invalid/config/etc/gshadow b/tests/log/lastlog/20_lastlog-b_invalid/config/etc/gshadow
deleted file mode 100644
index 1f2ba8da..00000000
--- a/tests/log/lastlog/20_lastlog-b_invalid/config/etc/gshadow
+++ /dev/null
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root,foo
-tty:*::foo
-disk:*:foo:
-lp:*::foo,root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*:foo:foo
-voice:*::
-cdrom:*:foo:foo
-floppy:*::foo
-tape:*::
-sudo:*::
-audio:*::
-dip:*::
-www-data:*::
-backup:*::
-operator:*::
-list:*::
-irc:*::
-src:*::
-gnats:*::
-shadow:*::
-utmp:*::
-video:*::
-sasl:*::
-plugdev:*::
-staff:*::
-games:*::
-users:*::
-nogroup:*::
-crontab:x::
-Debian-exim:x::
-foo:*::
diff --git a/tests/log/lastlog/20_lastlog-b_invalid/config/etc/passwd b/tests/log/lastlog/20_lastlog-b_invalid/config/etc/passwd
deleted file mode 100644
index 9d34d3af..00000000
--- a/tests/log/lastlog/20_lastlog-b_invalid/config/etc/passwd
+++ /dev/null
@@ -1,22 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-bar:x:1001:1001::/home/bar:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
-nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-foo:x:1000:1000::/home/foo:/bin/sh
-baz:x:1002:1002::/home/baz:/bin/sh
diff --git a/tests/log/lastlog/20_lastlog-b_invalid/config/etc/shadow b/tests/log/lastlog/20_lastlog-b_invalid/config/etc/shadow
deleted file mode 100644
index 972f2cd0..00000000
--- a/tests/log/lastlog/20_lastlog-b_invalid/config/etc/shadow
+++ /dev/null
@@ -1,22 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-bar:!:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::
-baz:!:12977:0:99999:7:::
diff --git a/tests/log/lastlog/20_lastlog-b_invalid/data/lastlog.err b/tests/log/lastlog/20_lastlog-b_invalid/data/lastlog.err
deleted file mode 100644
index 34429d41..00000000
--- a/tests/log/lastlog/20_lastlog-b_invalid/data/lastlog.err
+++ /dev/null
@@ -1 +0,0 @@
-lastlog: invalid numeric argument '2a'
diff --git a/tests/log/lastlog/20_lastlog-b_invalid/lastlog.test b/tests/log/lastlog/20_lastlog-b_invalid/lastlog.test
deleted file mode 100755
index af968131..00000000
--- a/tests/log/lastlog/20_lastlog-b_invalid/lastlog.test
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../../common/config.sh
-. ../../../common/log.sh
-
-log_start "$0" "reports invalid -b argument"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Create an empty /var/log/lastlog (it will not be restored)..."
-> /var/log/lastlog
-echo "OK"
-
-echo -n "lastlog -t 2a..."
-lastlog -b 2a 2>tmp/lastlog.err && exit 1 || {
-	status=$?
-}
-echo "OK."
-
-echo -n "Check returned status ($status)..."
-test "$status" = "1"
-echo "OK"
-
-echo "lastlog reported:"
-echo "======================================================================="
-cat tmp/lastlog.err
-echo "======================================================================="
-echo -n "Check the usage message..."
-diff -au data/lastlog.err tmp/lastlog.err
-echo "message OK."
-rm -f tmp/lastlog.err
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-