summaryrefslogtreecommitdiff
path: root/tests/cptools
diff options
context:
space:
mode:
Diffstat (limited to 'tests/cptools')
-rw-r--r--tests/cptools/01/data/group41
-rw-r--r--tests/cptools/01/data/group.new42
-rw-r--r--tests/cptools/01/data/gshadow41
-rw-r--r--tests/cptools/01/data/gshadow.new42
-rw-r--r--tests/cptools/01/data/passwd19
-rw-r--r--tests/cptools/01/data/passwd.new20
-rw-r--r--tests/cptools/01/data/shadow19
-rw-r--r--tests/cptools/01/data/shadow.new20
-rwxr-xr-xtests/cptools/01/run157
-rwxr-xr-xtests/cptools/01/run257
-rwxr-xr-xtests/cptools/01/run357
-rwxr-xr-xtests/cptools/01/run457
-rw-r--r--tests/cptools/02_cppw_usage/config.txt0
-rw-r--r--tests/cptools/02_cppw_usage/config/etc/group0
-rw-r--r--tests/cptools/02_cppw_usage/config/etc/gshadow0
-rw-r--r--tests/cptools/02_cppw_usage/config/etc/passwd0
-rw-r--r--tests/cptools/02_cppw_usage/config/etc/shadow0
-rwxr-xr-xtests/cptools/02_cppw_usage/cppw.test48
-rw-r--r--tests/cptools/02_cppw_usage/data/usage.out3
-rw-r--r--tests/cptools/03_cppw_usage_invalid_option/config.txt0
-rw-r--r--tests/cptools/03_cppw_usage_invalid_option/config/etc/group0
-rw-r--r--tests/cptools/03_cppw_usage_invalid_option/config/etc/gshadow0
-rw-r--r--tests/cptools/03_cppw_usage_invalid_option/config/etc/passwd0
-rw-r--r--tests/cptools/03_cppw_usage_invalid_option/config/etc/shadow0
-rwxr-xr-xtests/cptools/03_cppw_usage_invalid_option/cppw.test54
-rw-r--r--tests/cptools/03_cppw_usage_invalid_option/data/usage.out4
-rw-r--r--tests/cptools/04_cppw_no_file_argument/config.txt0
-rw-r--r--tests/cptools/04_cppw_no_file_argument/config/etc/group0
-rw-r--r--tests/cptools/04_cppw_no_file_argument/config/etc/gshadow0
-rw-r--r--tests/cptools/04_cppw_no_file_argument/config/etc/passwd0
-rw-r--r--tests/cptools/04_cppw_no_file_argument/config/etc/shadow0
-rwxr-xr-xtests/cptools/04_cppw_no_file_argument/cppw.test54
-rw-r--r--tests/cptools/04_cppw_no_file_argument/data/usage.out2
-rw-r--r--tests/cptools/05_cppw_2_files/config.txt0
-rw-r--r--tests/cptools/05_cppw_2_files/config/etc/group42
-rw-r--r--tests/cptools/05_cppw_2_files/config/etc/gshadow42
-rw-r--r--tests/cptools/05_cppw_2_files/config/etc/passwd21
-rw-r--r--tests/cptools/05_cppw_2_files/config/etc/shadow21
-rwxr-xr-xtests/cptools/05_cppw_2_files/cppw.test54
-rw-r--r--tests/cptools/05_cppw_2_files/data/passwd17
-rw-r--r--tests/cptools/05_cppw_2_files/data/usage.out2
-rw-r--r--tests/cptools/06_cppw_no_file/config.txt0
-rw-r--r--tests/cptools/06_cppw_no_file/config/etc/group0
-rw-r--r--tests/cptools/06_cppw_no_file/config/etc/gshadow0
-rw-r--r--tests/cptools/06_cppw_no_file/config/etc/passwd0
-rw-r--r--tests/cptools/06_cppw_no_file/config/etc/shadow0
-rwxr-xr-xtests/cptools/06_cppw_no_file/cppw.test54
-rw-r--r--tests/cptools/06_cppw_no_file/data/usage.out2
-rw-r--r--tests/cptools/07_cppw_locked_passwd/config.txt0
-rw-r--r--tests/cptools/07_cppw_locked_passwd/config/etc/group0
-rw-r--r--tests/cptools/07_cppw_locked_passwd/config/etc/gshadow0
-rw-r--r--tests/cptools/07_cppw_locked_passwd/config/etc/passwd0
-rw-r--r--tests/cptools/07_cppw_locked_passwd/config/etc/shadow0
-rwxr-xr-xtests/cptools/07_cppw_locked_passwd/cppw.test60
-rw-r--r--tests/cptools/07_cppw_locked_passwd/data/passwd0
-rw-r--r--tests/cptools/07_cppw_locked_passwd/data/usage.out3
-rw-r--r--tests/cptools/08_cppw-p/config.txt0
-rw-r--r--tests/cptools/08_cppw-p/config/etc/group0
-rw-r--r--tests/cptools/08_cppw-p/config/etc/gshadow0
-rw-r--r--tests/cptools/08_cppw-p/config/etc/passwd0
-rw-r--r--tests/cptools/08_cppw-p/config/etc/shadow0
-rwxr-xr-xtests/cptools/08_cppw-p/cppw.test39
-rw-r--r--tests/cptools/08_cppw-p/data/passwd0
-rw-r--r--tests/cptools/09_cppw-g/config.txt0
-rw-r--r--tests/cptools/09_cppw-g/config/etc/group42
-rw-r--r--tests/cptools/09_cppw-g/config/etc/gshadow42
-rw-r--r--tests/cptools/09_cppw-g/config/etc/passwd20
-rw-r--r--tests/cptools/09_cppw-g/config/etc/shadow20
-rwxr-xr-xtests/cptools/09_cppw-g/cppw.test39
-rw-r--r--tests/cptools/09_cppw-g/data/group39
-rw-r--r--tests/cptools/10_cppw-g-s/config.txt0
-rw-r--r--tests/cptools/10_cppw-g-s/config/etc/group42
-rw-r--r--tests/cptools/10_cppw-g-s/config/etc/gshadow42
-rw-r--r--tests/cptools/10_cppw-g-s/config/etc/passwd20
-rw-r--r--tests/cptools/10_cppw-g-s/config/etc/shadow20
-rwxr-xr-xtests/cptools/10_cppw-g-s/cppw.test39
-rw-r--r--tests/cptools/10_cppw-g-s/data/gshadow39
-rw-r--r--tests/cptools/11_cppw-p-s/config.txt0
-rw-r--r--tests/cptools/11_cppw-p-s/config/etc/group42
-rw-r--r--tests/cptools/11_cppw-p-s/config/etc/gshadow42
-rw-r--r--tests/cptools/11_cppw-p-s/config/etc/passwd20
-rw-r--r--tests/cptools/11_cppw-p-s/config/etc/shadow20
-rwxr-xr-xtests/cptools/11_cppw-p-s/cppw.test39
-rw-r--r--tests/cptools/11_cppw-p-s/data/shadow16
-rw-r--r--tests/cptools/12_cppw-s_no_shadow_file/config.txt0
-rw-r--r--tests/cptools/12_cppw-s_no_shadow_file/config/etc/group0
-rw-r--r--tests/cptools/12_cppw-s_no_shadow_file/config/etc/gshadow0
-rw-r--r--tests/cptools/12_cppw-s_no_shadow_file/config/etc/passwd0
-rw-r--r--tests/cptools/12_cppw-s_no_shadow_file/config/etc/shadow0
-rwxr-xr-xtests/cptools/12_cppw-s_no_shadow_file/cppw.test58
-rw-r--r--tests/cptools/12_cppw-s_no_shadow_file/data/cppw.err2
-rw-r--r--tests/cptools/12_cppw-s_no_shadow_file/data/shadow0
92 files changed, 0 insertions, 1637 deletions
diff --git a/tests/cptools/01/data/group b/tests/cptools/01/data/group
deleted file mode 100644
index 10123908..00000000
--- a/tests/cptools/01/data/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/cptools/01/data/group.new b/tests/cptools/01/data/group.new
deleted file mode 100644
index db5f1341..00000000
--- a/tests/cptools/01/data/group.new
+++ /dev/null
@@ -1,42 +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:
-test:x:10000:
diff --git a/tests/cptools/01/data/gshadow b/tests/cptools/01/data/gshadow
deleted file mode 100644
index ae424865..00000000
--- a/tests/cptools/01/data/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/cptools/01/data/gshadow.new b/tests/cptools/01/data/gshadow.new
deleted file mode 100644
index 3c9bae92..00000000
--- a/tests/cptools/01/data/gshadow.new
+++ /dev/null
@@ -1,42 +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::
-test:x::
diff --git a/tests/cptools/01/data/passwd b/tests/cptools/01/data/passwd
deleted file mode 100644
index 43fc135a..00000000
--- a/tests/cptools/01/data/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/cptools/01/data/passwd.new b/tests/cptools/01/data/passwd.new
deleted file mode 100644
index 148b7944..00000000
--- a/tests/cptools/01/data/passwd.new
+++ /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
-test:x:10002:10002::/tmp:/bin/false
diff --git a/tests/cptools/01/data/shadow b/tests/cptools/01/data/shadow
deleted file mode 100644
index 5f50d187..00000000
--- a/tests/cptools/01/data/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/cptools/01/data/shadow.new b/tests/cptools/01/data/shadow.new
deleted file mode 100644
index c6e351ee..00000000
--- a/tests/cptools/01/data/shadow.new
+++ /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:::
-test:!:10:0:99999:7:::
diff --git a/tests/cptools/01/run1 b/tests/cptools/01/run1
deleted file mode 100755
index 26fc0440..00000000
--- a/tests/cptools/01/run1
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-# Rational:
-# Test that useradd can add an user and userdel removes it.
-
-save()
-{
- [ ! -d tmp ] && mkdir tmp
- for i in passwd group shadow gshadow
- do
- [ -f /etc/$i ] && cp /etc/$i tmp/$i
- done
-
- true
-}
-
-restore()
-{
- for i in passwd group shadow gshadow
- do
- [ -f tmp/$i ] && cp tmp/$i /etc/$i && rm tmp/$i
- done
- rmdir tmp
-}
-
-save
-
-# restore the files on exit
-trap 'restore' 0
-
-for i in passwd group shadow gshadow
-do
- cp data/$i /etc
-done
-
-lines_passwd=$(wc -l /etc/passwd | cut -f1 -d" ")
-lines_shadow=$(wc -l /etc/shadow | cut -f1 -d" ")
-lines_group=$(wc -l /etc/group | cut -f1 -d" ")
-lines_gshadow=$(wc -l /etc/gshadow | cut -f1 -d" ")
-
-echo -n "Copy passwd.new "
-cppw data/passwd.new
-echo "OK"
-
-echo -n "test if the password file was copied"
-diff -au /etc/passwd data/passwd.new
-echo " OK"
-
-echo -n "check that the other files were not modified"
-diff -au /etc/group data/group
-diff -au /etc/gshadow data/gshadow
-diff -au /etc/shadow data/shadow
-echo " OK"
diff --git a/tests/cptools/01/run2 b/tests/cptools/01/run2
deleted file mode 100755
index c42238e6..00000000
--- a/tests/cptools/01/run2
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-# Rational:
-# Test that useradd can add an user and userdel removes it.
-
-save()
-{
- [ ! -d tmp ] && mkdir tmp
- for i in passwd group shadow gshadow
- do
- [ -f /etc/$i ] && cp /etc/$i tmp/$i
- done
-
- true
-}
-
-restore()
-{
- for i in passwd group shadow gshadow
- do
- [ -f tmp/$i ] && cp tmp/$i /etc/$i && rm tmp/$i
- done
- rmdir tmp
-}
-
-save
-
-# restore the files on exit
-trap 'restore' 0
-
-for i in passwd group shadow gshadow
-do
- cp data/$i /etc
-done
-
-lines_passwd=$(wc -l /etc/passwd | cut -f1 -d" ")
-lines_shadow=$(wc -l /etc/shadow | cut -f1 -d" ")
-lines_group=$(wc -l /etc/group | cut -f1 -d" ")
-lines_gshadow=$(wc -l /etc/gshadow | cut -f1 -d" ")
-
-echo -n "Copy group.new "
-cpgr data/group.new
-echo "OK"
-
-echo -n "test if the password file was copied"
-diff -au /etc/group data/group.new
-echo " OK"
-
-echo -n "check that the other files were not modified"
-diff -au /etc/gshadow data/gshadow
-diff -au /etc/passwd data/passwd
-diff -au /etc/shadow data/shadow
-echo " OK"
diff --git a/tests/cptools/01/run3 b/tests/cptools/01/run3
deleted file mode 100755
index d213e477..00000000
--- a/tests/cptools/01/run3
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-# Rational:
-# Test that useradd can add an user and userdel removes it.
-
-save()
-{
- [ ! -d tmp ] && mkdir tmp
- for i in passwd group shadow gshadow
- do
- [ -f /etc/$i ] && cp /etc/$i tmp/$i
- done
-
- true
-}
-
-restore()
-{
- for i in passwd group shadow gshadow
- do
- [ -f tmp/$i ] && cp tmp/$i /etc/$i && rm tmp/$i
- done
- rmdir tmp
-}
-
-save
-
-# restore the files on exit
-trap 'restore' 0
-
-for i in passwd group shadow gshadow
-do
- cp data/$i /etc
-done
-
-lines_passwd=$(wc -l /etc/passwd | cut -f1 -d" ")
-lines_shadow=$(wc -l /etc/shadow | cut -f1 -d" ")
-lines_group=$(wc -l /etc/group | cut -f1 -d" ")
-lines_gshadow=$(wc -l /etc/gshadow | cut -f1 -d" ")
-
-echo -n "Copy shadow.new "
-cppw -s data/shadow.new
-echo "OK"
-
-echo -n "test if the password file was copied"
-diff -au /etc/shadow data/shadow.new
-echo " OK"
-
-echo -n "check that the other files were not modified"
-diff -au /etc/group data/group
-diff -au /etc/gshadow data/gshadow
-diff -au /etc/passwd data/passwd
-echo " OK"
diff --git a/tests/cptools/01/run4 b/tests/cptools/01/run4
deleted file mode 100755
index 7cc3fb8d..00000000
--- a/tests/cptools/01/run4
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-# Rational:
-# Test that useradd can add an user and userdel removes it.
-
-save()
-{
- [ ! -d tmp ] && mkdir tmp
- for i in passwd group shadow gshadow
- do
- [ -f /etc/$i ] && cp /etc/$i tmp/$i
- done
-
- true
-}
-
-restore()
-{
- for i in passwd group shadow gshadow
- do
- [ -f tmp/$i ] && cp tmp/$i /etc/$i && rm tmp/$i
- done
- rmdir tmp
-}
-
-save
-
-# restore the files on exit
-trap 'restore' 0
-
-for i in passwd group shadow gshadow
-do
- cp data/$i /etc
-done
-
-lines_passwd=$(wc -l /etc/passwd | cut -f1 -d" ")
-lines_shadow=$(wc -l /etc/shadow | cut -f1 -d" ")
-lines_group=$(wc -l /etc/group | cut -f1 -d" ")
-lines_gshadow=$(wc -l /etc/gshadow | cut -f1 -d" ")
-
-echo -n "Copy gshadow.new "
-cpgr -s data/gshadow.new
-echo "OK"
-
-echo -n "test if the password file was copied"
-diff -au /etc/gshadow data/gshadow.new
-echo " OK"
-
-echo -n "check that the other files were not modified"
-diff -au /etc/group data/group
-diff -au /etc/passwd data/passwd
-diff -au /etc/shadow data/shadow
-echo " OK"
diff --git a/tests/cptools/02_cppw_usage/config.txt b/tests/cptools/02_cppw_usage/config.txt
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/02_cppw_usage/config.txt
+++ /dev/null
diff --git a/tests/cptools/02_cppw_usage/config/etc/group b/tests/cptools/02_cppw_usage/config/etc/group
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/02_cppw_usage/config/etc/group
+++ /dev/null
diff --git a/tests/cptools/02_cppw_usage/config/etc/gshadow b/tests/cptools/02_cppw_usage/config/etc/gshadow
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/02_cppw_usage/config/etc/gshadow
+++ /dev/null
diff --git a/tests/cptools/02_cppw_usage/config/etc/passwd b/tests/cptools/02_cppw_usage/config/etc/passwd
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/02_cppw_usage/config/etc/passwd
+++ /dev/null
diff --git a/tests/cptools/02_cppw_usage/config/etc/shadow b/tests/cptools/02_cppw_usage/config/etc/shadow
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/02_cppw_usage/config/etc/shadow
+++ /dev/null
diff --git a/tests/cptools/02_cppw_usage/cppw.test b/tests/cptools/02_cppw_usage/cppw.test
deleted file mode 100755
index ef3b77f2..00000000
--- a/tests/cptools/02_cppw_usage/cppw.test
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "cppw can displays its usage message"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Get cppw usage (cppw -h)..."
-cppw -h >tmp/usage.out
-echo "OK"
-
-echo "cppw 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
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl config/etc/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl config/etc/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl config/etc/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl config/etc/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/cptools/02_cppw_usage/data/usage.out b/tests/cptools/02_cppw_usage/data/usage.out
deleted file mode 100644
index 9efb2a70..00000000
--- a/tests/cptools/02_cppw_usage/data/usage.out
+++ /dev/null
@@ -1,3 +0,0 @@
-Usage:
-`cppw <file>' copys over /etc/passwd `cppw -s <file>' copys over /etc/shadow
-`cpgr <file>' copys over /etc/group `cpgr -s <file>' copys over /etc/gshadow
diff --git a/tests/cptools/03_cppw_usage_invalid_option/config.txt b/tests/cptools/03_cppw_usage_invalid_option/config.txt
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/03_cppw_usage_invalid_option/config.txt
+++ /dev/null
diff --git a/tests/cptools/03_cppw_usage_invalid_option/config/etc/group b/tests/cptools/03_cppw_usage_invalid_option/config/etc/group
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/03_cppw_usage_invalid_option/config/etc/group
+++ /dev/null
diff --git a/tests/cptools/03_cppw_usage_invalid_option/config/etc/gshadow b/tests/cptools/03_cppw_usage_invalid_option/config/etc/gshadow
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/03_cppw_usage_invalid_option/config/etc/gshadow
+++ /dev/null
diff --git a/tests/cptools/03_cppw_usage_invalid_option/config/etc/passwd b/tests/cptools/03_cppw_usage_invalid_option/config/etc/passwd
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/03_cppw_usage_invalid_option/config/etc/passwd
+++ /dev/null
diff --git a/tests/cptools/03_cppw_usage_invalid_option/config/etc/shadow b/tests/cptools/03_cppw_usage_invalid_option/config/etc/shadow
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/03_cppw_usage_invalid_option/config/etc/shadow
+++ /dev/null
diff --git a/tests/cptools/03_cppw_usage_invalid_option/cppw.test b/tests/cptools/03_cppw_usage_invalid_option/cppw.test
deleted file mode 100755
index c6d41e98..00000000
--- a/tests/cptools/03_cppw_usage_invalid_option/cppw.test
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "cppw reports usage of invalid option"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Use wrong cppw option (cppw -Z)..."
-/usr/sbin/cppw -Z 2>tmp/usage.out && exit 1 || {
- status=$?
-}
-echo "OK"
-
-echo -n "Check returned status ($status)..."
-test "$status" = "2"
-echo "OK"
-
-echo "cppw 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
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl config/etc/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl config/etc/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl config/etc/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl config/etc/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/cptools/03_cppw_usage_invalid_option/data/usage.out b/tests/cptools/03_cppw_usage_invalid_option/data/usage.out
deleted file mode 100644
index 633ff23d..00000000
--- a/tests/cptools/03_cppw_usage_invalid_option/data/usage.out
+++ /dev/null
@@ -1,4 +0,0 @@
-/usr/sbin/cppw: invalid option -- 'Z'
-Usage:
-`cppw <file>' copys over /etc/passwd `cppw -s <file>' copys over /etc/shadow
-`cpgr <file>' copys over /etc/group `cpgr -s <file>' copys over /etc/gshadow
diff --git a/tests/cptools/04_cppw_no_file_argument/config.txt b/tests/cptools/04_cppw_no_file_argument/config.txt
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/04_cppw_no_file_argument/config.txt
+++ /dev/null
diff --git a/tests/cptools/04_cppw_no_file_argument/config/etc/group b/tests/cptools/04_cppw_no_file_argument/config/etc/group
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/04_cppw_no_file_argument/config/etc/group
+++ /dev/null
diff --git a/tests/cptools/04_cppw_no_file_argument/config/etc/gshadow b/tests/cptools/04_cppw_no_file_argument/config/etc/gshadow
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/04_cppw_no_file_argument/config/etc/gshadow
+++ /dev/null
diff --git a/tests/cptools/04_cppw_no_file_argument/config/etc/passwd b/tests/cptools/04_cppw_no_file_argument/config/etc/passwd
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/04_cppw_no_file_argument/config/etc/passwd
+++ /dev/null
diff --git a/tests/cptools/04_cppw_no_file_argument/config/etc/shadow b/tests/cptools/04_cppw_no_file_argument/config/etc/shadow
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/04_cppw_no_file_argument/config/etc/shadow
+++ /dev/null
diff --git a/tests/cptools/04_cppw_no_file_argument/cppw.test b/tests/cptools/04_cppw_no_file_argument/cppw.test
deleted file mode 100755
index 7ccef735..00000000
--- a/tests/cptools/04_cppw_no_file_argument/cppw.test
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "cppw reports an error if no files are provided"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Use cppw without a file argument (cppw)..."
-cppw 2>tmp/usage.out && exit 1 || {
- status=$?
-}
-echo "OK"
-
-echo -n "Check returned status ($status)..."
-test "$status" = "1"
-echo "OK"
-
-echo "cppw 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
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl config/etc/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl config/etc/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl config/etc/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl config/etc/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/cptools/04_cppw_no_file_argument/data/usage.out b/tests/cptools/04_cppw_no_file_argument/data/usage.out
deleted file mode 100644
index 808df395..00000000
--- a/tests/cptools/04_cppw_no_file_argument/data/usage.out
+++ /dev/null
@@ -1,2 +0,0 @@
-cppw: wrong number of arguments, -h for usage
-cppw: no changes
diff --git a/tests/cptools/05_cppw_2_files/config.txt b/tests/cptools/05_cppw_2_files/config.txt
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/05_cppw_2_files/config.txt
+++ /dev/null
diff --git a/tests/cptools/05_cppw_2_files/config/etc/group b/tests/cptools/05_cppw_2_files/config/etc/group
deleted file mode 100644
index 245cc9cf..00000000
--- a/tests/cptools/05_cppw_2_files/config/etc/group
+++ /dev/null
@@ -1,42 +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:
-myuser:x:424242:
diff --git a/tests/cptools/05_cppw_2_files/config/etc/gshadow b/tests/cptools/05_cppw_2_files/config/etc/gshadow
deleted file mode 100644
index 25bd55bd..00000000
--- a/tests/cptools/05_cppw_2_files/config/etc/gshadow
+++ /dev/null
@@ -1,42 +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::
-myuser:x::
diff --git a/tests/cptools/05_cppw_2_files/config/etc/passwd b/tests/cptools/05_cppw_2_files/config/etc/passwd
deleted file mode 100644
index ae3eda3f..00000000
--- a/tests/cptools/05_cppw_2_files/config/etc/passwd
+++ /dev/null
@@ -1,21 +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
-myuser:x:424242:424242::/home:/bin/sh
-myuser2:x:424243:424242::/home:/bin/sh
diff --git a/tests/cptools/05_cppw_2_files/config/etc/shadow b/tests/cptools/05_cppw_2_files/config/etc/shadow
deleted file mode 100644
index f004fa26..00000000
--- a/tests/cptools/05_cppw_2_files/config/etc/shadow
+++ /dev/null
@@ -1,21 +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:::
-myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7:::
-myuser2:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7:::
diff --git a/tests/cptools/05_cppw_2_files/cppw.test b/tests/cptools/05_cppw_2_files/cppw.test
deleted file mode 100755
index 49ca1d57..00000000
--- a/tests/cptools/05_cppw_2_files/cppw.test
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "cppw reports an error if 2 files are provided"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Use cppw with 2 files (cppw data/passwd data/passwd)..."
-cppw data/passwd data/passwd 2>tmp/usage.out && exit 1 || {
- status=$?
-}
-echo "OK"
-
-echo -n "Check returned status ($status)..."
-test "$status" = "1"
-echo "OK"
-
-echo "cppw 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
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl config/etc/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl config/etc/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl config/etc/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl config/etc/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/cptools/05_cppw_2_files/data/passwd b/tests/cptools/05_cppw_2_files/data/passwd
deleted file mode 100644
index e8e3c399..00000000
--- a/tests/cptools/05_cppw_2_files/data/passwd
+++ /dev/null
@@ -1,17 +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
diff --git a/tests/cptools/05_cppw_2_files/data/usage.out b/tests/cptools/05_cppw_2_files/data/usage.out
deleted file mode 100644
index 808df395..00000000
--- a/tests/cptools/05_cppw_2_files/data/usage.out
+++ /dev/null
@@ -1,2 +0,0 @@
-cppw: wrong number of arguments, -h for usage
-cppw: no changes
diff --git a/tests/cptools/06_cppw_no_file/config.txt b/tests/cptools/06_cppw_no_file/config.txt
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/06_cppw_no_file/config.txt
+++ /dev/null
diff --git a/tests/cptools/06_cppw_no_file/config/etc/group b/tests/cptools/06_cppw_no_file/config/etc/group
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/06_cppw_no_file/config/etc/group
+++ /dev/null
diff --git a/tests/cptools/06_cppw_no_file/config/etc/gshadow b/tests/cptools/06_cppw_no_file/config/etc/gshadow
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/06_cppw_no_file/config/etc/gshadow
+++ /dev/null
diff --git a/tests/cptools/06_cppw_no_file/config/etc/passwd b/tests/cptools/06_cppw_no_file/config/etc/passwd
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/06_cppw_no_file/config/etc/passwd
+++ /dev/null
diff --git a/tests/cptools/06_cppw_no_file/config/etc/shadow b/tests/cptools/06_cppw_no_file/config/etc/shadow
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/06_cppw_no_file/config/etc/shadow
+++ /dev/null
diff --git a/tests/cptools/06_cppw_no_file/cppw.test b/tests/cptools/06_cppw_no_file/cppw.test
deleted file mode 100755
index 67a35a91..00000000
--- a/tests/cptools/06_cppw_no_file/cppw.test
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "cppw reports an error if no files are provided"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Use cppw with a nonexistant file (cppw data/passwd)..."
-cppw data/passwd 2>tmp/usage.out && exit 1 || {
- status=$?
-}
-echo "OK"
-
-echo -n "Check returned status ($status)..."
-test "$status" = "1"
-echo "OK"
-
-echo "cppw 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
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl config/etc/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl config/etc/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl config/etc/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl config/etc/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/cptools/06_cppw_no_file/data/usage.out b/tests/cptools/06_cppw_no_file/data/usage.out
deleted file mode 100644
index 133dea3e..00000000
--- a/tests/cptools/06_cppw_no_file/data/usage.out
+++ /dev/null
@@ -1,2 +0,0 @@
-cppw: data/passwd: No such file or directory
-cppw: /etc/passwd is unchanged
diff --git a/tests/cptools/07_cppw_locked_passwd/config.txt b/tests/cptools/07_cppw_locked_passwd/config.txt
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/07_cppw_locked_passwd/config.txt
+++ /dev/null
diff --git a/tests/cptools/07_cppw_locked_passwd/config/etc/group b/tests/cptools/07_cppw_locked_passwd/config/etc/group
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/07_cppw_locked_passwd/config/etc/group
+++ /dev/null
diff --git a/tests/cptools/07_cppw_locked_passwd/config/etc/gshadow b/tests/cptools/07_cppw_locked_passwd/config/etc/gshadow
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/07_cppw_locked_passwd/config/etc/gshadow
+++ /dev/null
diff --git a/tests/cptools/07_cppw_locked_passwd/config/etc/passwd b/tests/cptools/07_cppw_locked_passwd/config/etc/passwd
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/07_cppw_locked_passwd/config/etc/passwd
+++ /dev/null
diff --git a/tests/cptools/07_cppw_locked_passwd/config/etc/shadow b/tests/cptools/07_cppw_locked_passwd/config/etc/shadow
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/07_cppw_locked_passwd/config/etc/shadow
+++ /dev/null
diff --git a/tests/cptools/07_cppw_locked_passwd/cppw.test b/tests/cptools/07_cppw_locked_passwd/cppw.test
deleted file mode 100755
index 366618e0..00000000
--- a/tests/cptools/07_cppw_locked_passwd/cppw.test
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "cppw checks if the password file is locked"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Create lock file for /etc/passwd..."
-touch /etc/passwd.lock
-echo "done"
-
-echo -n "Use cppw (cppw data/passwd)..."
-cppw data/passwd 2>tmp/usage.out && exit 1 || {
- status=$?
-}
-echo "OK"
-
-rm -f /etc/passwd.lock
-
-echo -n "Check returned status ($status)..."
-test "$status" = "5"
-echo "OK"
-
-echo "cppw 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
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl config/etc/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl config/etc/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl config/etc/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl config/etc/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/cptools/07_cppw_locked_passwd/data/passwd b/tests/cptools/07_cppw_locked_passwd/data/passwd
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/07_cppw_locked_passwd/data/passwd
+++ /dev/null
diff --git a/tests/cptools/07_cppw_locked_passwd/data/usage.out b/tests/cptools/07_cppw_locked_passwd/data/usage.out
deleted file mode 100644
index c99e46a1..00000000
--- a/tests/cptools/07_cppw_locked_passwd/data/usage.out
+++ /dev/null
@@ -1,3 +0,0 @@
-cppw: existing lock file /etc/passwd.lock without a PID
-cppw: Couldn't lock file
-cppw: /etc/passwd is unchanged
diff --git a/tests/cptools/08_cppw-p/config.txt b/tests/cptools/08_cppw-p/config.txt
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/08_cppw-p/config.txt
+++ /dev/null
diff --git a/tests/cptools/08_cppw-p/config/etc/group b/tests/cptools/08_cppw-p/config/etc/group
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/08_cppw-p/config/etc/group
+++ /dev/null
diff --git a/tests/cptools/08_cppw-p/config/etc/gshadow b/tests/cptools/08_cppw-p/config/etc/gshadow
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/08_cppw-p/config/etc/gshadow
+++ /dev/null
diff --git a/tests/cptools/08_cppw-p/config/etc/passwd b/tests/cptools/08_cppw-p/config/etc/passwd
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/08_cppw-p/config/etc/passwd
+++ /dev/null
diff --git a/tests/cptools/08_cppw-p/config/etc/shadow b/tests/cptools/08_cppw-p/config/etc/shadow
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/08_cppw-p/config/etc/shadow
+++ /dev/null
diff --git a/tests/cptools/08_cppw-p/cppw.test b/tests/cptools/08_cppw-p/cppw.test
deleted file mode 100755
index d4ee8646..00000000
--- a/tests/cptools/08_cppw-p/cppw.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "cppw -p option"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Use cppw -p (cppw -p data/passwd)..."
-cppw -p data/passwd
-echo "OK"
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl data/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl config/etc/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl config/etc/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl config/etc/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/cptools/08_cppw-p/data/passwd b/tests/cptools/08_cppw-p/data/passwd
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/08_cppw-p/data/passwd
+++ /dev/null
diff --git a/tests/cptools/09_cppw-g/config.txt b/tests/cptools/09_cppw-g/config.txt
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/09_cppw-g/config.txt
+++ /dev/null
diff --git a/tests/cptools/09_cppw-g/config/etc/group b/tests/cptools/09_cppw-g/config/etc/group
deleted file mode 100644
index b6fae894..00000000
--- a/tests/cptools/09_cppw-g/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/cptools/09_cppw-g/config/etc/gshadow b/tests/cptools/09_cppw-g/config/etc/gshadow
deleted file mode 100644
index 1f2ba8da..00000000
--- a/tests/cptools/09_cppw-g/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/cptools/09_cppw-g/config/etc/passwd b/tests/cptools/09_cppw-g/config/etc/passwd
deleted file mode 100644
index 06b331b3..00000000
--- a/tests/cptools/09_cppw-g/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:blahblahblah:1000:1000::/home/foo:/bin/false
diff --git a/tests/cptools/09_cppw-g/config/etc/shadow b/tests/cptools/09_cppw-g/config/etc/shadow
deleted file mode 100644
index 2baad3b4..00000000
--- a/tests/cptools/09_cppw-g/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/cptools/09_cppw-g/cppw.test b/tests/cptools/09_cppw-g/cppw.test
deleted file mode 100755
index 7ac6d16c..00000000
--- a/tests/cptools/09_cppw-g/cppw.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "cppw can copy the group file"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Use cppw -g (cppw -g data/group)..."
-cppw -g data/group
-echo "OK"
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl config/etc/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl data/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl config/etc/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl config/etc/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/cptools/09_cppw-g/data/group b/tests/cptools/09_cppw-g/data/group
deleted file mode 100644
index 11b5c118..00000000
--- a/tests/cptools/09_cppw-g/data/group
+++ /dev/null
@@ -1,39 +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:
diff --git a/tests/cptools/10_cppw-g-s/config.txt b/tests/cptools/10_cppw-g-s/config.txt
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/10_cppw-g-s/config.txt
+++ /dev/null
diff --git a/tests/cptools/10_cppw-g-s/config/etc/group b/tests/cptools/10_cppw-g-s/config/etc/group
deleted file mode 100644
index b6fae894..00000000
--- a/tests/cptools/10_cppw-g-s/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/cptools/10_cppw-g-s/config/etc/gshadow b/tests/cptools/10_cppw-g-s/config/etc/gshadow
deleted file mode 100644
index 1f2ba8da..00000000
--- a/tests/cptools/10_cppw-g-s/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/cptools/10_cppw-g-s/config/etc/passwd b/tests/cptools/10_cppw-g-s/config/etc/passwd
deleted file mode 100644
index 06b331b3..00000000
--- a/tests/cptools/10_cppw-g-s/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:blahblahblah:1000:1000::/home/foo:/bin/false
diff --git a/tests/cptools/10_cppw-g-s/config/etc/shadow b/tests/cptools/10_cppw-g-s/config/etc/shadow
deleted file mode 100644
index 2baad3b4..00000000
--- a/tests/cptools/10_cppw-g-s/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/cptools/10_cppw-g-s/cppw.test b/tests/cptools/10_cppw-g-s/cppw.test
deleted file mode 100755
index 602c34ac..00000000
--- a/tests/cptools/10_cppw-g-s/cppw.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "cppw can copy the gshadow file"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Use cppw -g -s (cppw -g -s data/gshadow)..."
-cppw -g -s data/gshadow
-echo "OK"
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl config/etc/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl config/etc/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl config/etc/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl data/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/cptools/10_cppw-g-s/data/gshadow b/tests/cptools/10_cppw-g-s/data/gshadow
deleted file mode 100644
index 93fc0558..00000000
--- a/tests/cptools/10_cppw-g-s/data/gshadow
+++ /dev/null
@@ -1,39 +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:*::
diff --git a/tests/cptools/11_cppw-p-s/config.txt b/tests/cptools/11_cppw-p-s/config.txt
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/11_cppw-p-s/config.txt
+++ /dev/null
diff --git a/tests/cptools/11_cppw-p-s/config/etc/group b/tests/cptools/11_cppw-p-s/config/etc/group
deleted file mode 100644
index b6fae894..00000000
--- a/tests/cptools/11_cppw-p-s/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/cptools/11_cppw-p-s/config/etc/gshadow b/tests/cptools/11_cppw-p-s/config/etc/gshadow
deleted file mode 100644
index 1f2ba8da..00000000
--- a/tests/cptools/11_cppw-p-s/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/cptools/11_cppw-p-s/config/etc/passwd b/tests/cptools/11_cppw-p-s/config/etc/passwd
deleted file mode 100644
index 06b331b3..00000000
--- a/tests/cptools/11_cppw-p-s/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:blahblahblah:1000:1000::/home/foo:/bin/false
diff --git a/tests/cptools/11_cppw-p-s/config/etc/shadow b/tests/cptools/11_cppw-p-s/config/etc/shadow
deleted file mode 100644
index 2baad3b4..00000000
--- a/tests/cptools/11_cppw-p-s/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/cptools/11_cppw-p-s/cppw.test b/tests/cptools/11_cppw-p-s/cppw.test
deleted file mode 100755
index 3c68f056..00000000
--- a/tests/cptools/11_cppw-p-s/cppw.test
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "cppw can copy the shadow file"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Use cppw -p -s (cppw -p -s data/shadow)..."
-cppw -p -s data/shadow
-echo "OK"
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl config/etc/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl config/etc/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../common/compare_file.pl data/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl config/etc/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/cptools/11_cppw-p-s/data/shadow b/tests/cptools/11_cppw-p-s/data/shadow
deleted file mode 100644
index 62144232..00000000
--- a/tests/cptools/11_cppw-p-s/data/shadow
+++ /dev/null
@@ -1,16 +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:::
-Debian-exim:!:12977:0:99999:7:::
-foo:!:12977:0:99999:7:::
diff --git a/tests/cptools/12_cppw-s_no_shadow_file/config.txt b/tests/cptools/12_cppw-s_no_shadow_file/config.txt
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/12_cppw-s_no_shadow_file/config.txt
+++ /dev/null
diff --git a/tests/cptools/12_cppw-s_no_shadow_file/config/etc/group b/tests/cptools/12_cppw-s_no_shadow_file/config/etc/group
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/12_cppw-s_no_shadow_file/config/etc/group
+++ /dev/null
diff --git a/tests/cptools/12_cppw-s_no_shadow_file/config/etc/gshadow b/tests/cptools/12_cppw-s_no_shadow_file/config/etc/gshadow
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/12_cppw-s_no_shadow_file/config/etc/gshadow
+++ /dev/null
diff --git a/tests/cptools/12_cppw-s_no_shadow_file/config/etc/passwd b/tests/cptools/12_cppw-s_no_shadow_file/config/etc/passwd
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/12_cppw-s_no_shadow_file/config/etc/passwd
+++ /dev/null
diff --git a/tests/cptools/12_cppw-s_no_shadow_file/config/etc/shadow b/tests/cptools/12_cppw-s_no_shadow_file/config/etc/shadow
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/12_cppw-s_no_shadow_file/config/etc/shadow
+++ /dev/null
diff --git a/tests/cptools/12_cppw-s_no_shadow_file/cppw.test b/tests/cptools/12_cppw-s_no_shadow_file/cppw.test
deleted file mode 100755
index a0c2095b..00000000
--- a/tests/cptools/12_cppw-s_no_shadow_file/cppw.test
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "cppw can copy a shadow file even if there were no shadow file"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Remove /etc/shadow..."
-rm -f /etc/shadow
-echo "done"
-
-echo -n "Use cppw (cppw -s data/shadow)..."
-cppw -s data/shadow 2>tmp/cppw.err && exit 1 || {
- status=$?
-}
-echo "OK"
-
-echo -n "Check returned status ($status)..."
-test "$status" = "1"
-echo "OK"
-
-echo "cppw reported:"
-echo "======================================================================="
-cat tmp/cppw.err
-echo "======================================================================="
-echo -n "Check the usage message..."
-diff -au data/cppw.err tmp/cppw.err
-echo "usage message OK."
-rm -f tmp/cppw.err
-
-echo -n "Check the passwd file..."
-../../common/compare_file.pl config/etc/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../common/compare_file.pl config/etc/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-test ! -f /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../common/compare_file.pl config/etc/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-
diff --git a/tests/cptools/12_cppw-s_no_shadow_file/data/cppw.err b/tests/cptools/12_cppw-s_no_shadow_file/data/cppw.err
deleted file mode 100644
index 0c7d649e..00000000
--- a/tests/cptools/12_cppw-s_no_shadow_file/data/cppw.err
+++ /dev/null
@@ -1,2 +0,0 @@
-cppw: /etc/shadow: No such file or directory
-cppw: /etc/shadow is unchanged
diff --git a/tests/cptools/12_cppw-s_no_shadow_file/data/shadow b/tests/cptools/12_cppw-s_no_shadow_file/data/shadow
deleted file mode 100644
index e69de29b..00000000
--- a/tests/cptools/12_cppw-s_no_shadow_file/data/shadow
+++ /dev/null