test: rename test directory

29 files changed, 1 insertions, 96 deletions

diff --git a/src/test-engine.c b/src/test-engine.c
index 60619b9d36..46a2d2cda0 100644
--- a/src/test-engine.c
+++ b/src/test-engine.c
@@ -31,7 +31,7 @@ int main(int argc, char *argv[]) {
         Unit *a = NULL, *b = NULL, *c = NULL, *d = NULL, *e = NULL, *g = NULL, *h = NULL;
         Job *j;
 
-        assert_se(set_unit_path("test2") >= 0);
+        assert_se(set_unit_path("test") >= 0);
 
         assert_se(manager_new(MANAGER_SYSTEM, &m) >= 0);
 
diff --git a/test2/Makefile b/test/Makefile
index 9aa46b4eb6..9aa46b4eb6 100644
--- a/test2/Makefile
+++ b/test/Makefile
diff --git a/test2/a.service b/test/a.service
index 4168d2d051..4168d2d051 100644
--- a/test2/a.service
+++ b/test/a.service
diff --git a/test2/b.service b/test/b.service
index e03bae36be..e03bae36be 100644
--- a/test2/b.service
+++ b/test/b.service
diff --git a/test2/c.service b/test/c.service
index e2f60a8fbf..e2f60a8fbf 100644
--- a/test2/c.service
+++ b/test/c.service
diff --git a/test2/d.service b/test/d.service
index 921fd2ee1b..921fd2ee1b 100644
--- a/test2/d.service
+++ b/test/d.service
diff --git a/test2/e.service b/test/e.service
index 5ba98c7c43..5ba98c7c43 100644
--- a/test2/e.service
+++ b/test/e.service
diff --git a/test2/f.service b/test/f.service
index 7dde681c17..7dde681c17 100644
--- a/test2/f.service
+++ b/test/f.service
diff --git a/test2/g.service b/test/g.service
index cbfa82a454..cbfa82a454 100644
--- a/test2/g.service
+++ b/test/g.service
diff --git a/test2/h.service b/test/h.service
index 74a7751cad..74a7751cad 100644
--- a/test2/h.service
+++ b/test/h.service
diff --git a/test1/default.target b/test1/default.target
deleted file mode 120000
index 264d98085b..0000000000
--- a/test1/default.target
+++ /dev/null
@@ -1 +0,0 @@
-multiuser.target
\ No newline at end of file
diff --git a/test1/exec-demo.service b/test1/exec-demo.service
deleted file mode 100644
index 5802e37697..0000000000
--- a/test1/exec-demo.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Meta]
-Description=Simple Execution Demo
-
-[Service]
-ExecStartPre=/bin/ps -eo pid,uid,args,cgroup
-ExecStartPre=/bin/cat /etc/hosts
-ExecStart=/bin/bash -c '/bin/sleep 5 &'
-Type=forking
-Output=syslog
diff --git a/test1/fifo-demo.service b/test1/fifo-demo.service
deleted file mode 100644
index 51b19961fa..0000000000
--- a/test1/fifo-demo.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Meta]
-Description=FIFO Activation Demo Service
-
-[Service]
-ExecStartPre=/bin/echo "Wow, es geht los!"
-#ExecStart=/bin/bash -c 'read a <&3 ; echo "GOT: $a"'
-ExecStart=/bin/bash -c 'cat <&3'
-Type=simple
diff --git a/test1/fifo-demo.socket b/test1/fifo-demo.socket
deleted file mode 100644
index 75ce7a6999..0000000000
--- a/test1/fifo-demo.socket
+++ /dev/null
@@ -1,6 +0,0 @@
-[Meta]
-Description=FIFO Activation Demo Socket
-
-[Socket]
-ListenFIFO=/tmp/systemd-fifo-demo
-ExecStartPost=/bin/echo "OK, we're ready, now write something to /tmp/systemd-fifo-demo"
diff --git a/test1/mail-transfer-agent.service b/test1/mail-transfer-agent.service
deleted file mode 120000
index bca89da28e..0000000000
--- a/test1/mail-transfer-agent.service
+++ /dev/null
@@ -1 +0,0 @@
-postfix.service
\ No newline at end of file
diff --git a/test1/mail-transfer-agent.socket b/test1/mail-transfer-agent.socket
deleted file mode 120000
index daf3277d02..0000000000
--- a/test1/mail-transfer-agent.socket
+++ /dev/null
@@ -1 +0,0 @@
-postfix.socket
\ No newline at end of file
diff --git a/test1/multiuser.target b/test1/multiuser.target
deleted file mode 100644
index f105e3c2f0..0000000000
--- a/test1/multiuser.target
+++ /dev/null
@@ -1,2 +0,0 @@
-[Meta]
-Description=Multi-User Target
diff --git a/test1/multiuser.target.wants/exec-demo.service b/test1/multiuser.target.wants/exec-demo.service
deleted file mode 120000
index 0ec1e35824..0000000000
--- a/test1/multiuser.target.wants/exec-demo.service
+++ /dev/null
@@ -1 +0,0 @@
-../exec-demo.service
\ No newline at end of file
diff --git a/test1/multiuser.target.wants/fifo-demo.socket b/test1/multiuser.target.wants/fifo-demo.socket
deleted file mode 120000
index 4c3d621e90..0000000000
--- a/test1/multiuser.target.wants/fifo-demo.socket
+++ /dev/null
@@ -1 +0,0 @@
-../fifo-demo.socket
\ No newline at end of file
diff --git a/test1/multiuser.target.wants/mail-transfer-agent.socket b/test1/multiuser.target.wants/mail-transfer-agent.socket
deleted file mode 120000
index 3c3a2db350..0000000000
--- a/test1/multiuser.target.wants/mail-transfer-agent.socket
+++ /dev/null
@@ -1 +0,0 @@
-../mail-transfer-agent.socket
\ No newline at end of file
diff --git a/test1/multiuser.target.wants/permissions.service b/test1/multiuser.target.wants/permissions.service
deleted file mode 120000
index 98f3d5fab2..0000000000
--- a/test1/multiuser.target.wants/permissions.service
+++ /dev/null
@@ -1 +0,0 @@
-../permissions.service
\ No newline at end of file
diff --git a/test1/multiuser.target.wants/systemd-logger.socket b/test1/multiuser.target.wants/systemd-logger.socket
deleted file mode 120000
index 4ce0a61aa1..0000000000
--- a/test1/multiuser.target.wants/systemd-logger.socket
+++ /dev/null
@@ -1 +0,0 @@
-../systemd-logger.socket
\ No newline at end of file
diff --git a/test1/permissions.service b/test1/permissions.service
deleted file mode 100644
index cb0664fa4f..0000000000
--- a/test1/permissions.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Meta]
-Description=Permission Enforcement checker
-
-[Service]
-ExecStart=/usr/bin/id
-ExecStartPost=/usr/bin/env
-ExecStartPost=/bin/sleep 5
-Type=oneshot
-Capabilities=all= cap_dac_override=eip
-User=nobody
-Group=nobody
diff --git a/test1/postfix.service b/test1/postfix.service
deleted file mode 100644
index fbf39ecb58..0000000000
--- a/test1/postfix.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[Meta]
-Names=mail-transfer-agent.service
-Description=Postfix Mail Server
-Requires=syslog.socket
-
-[Service]
-ExecStart=/usr/bin/postfix
diff --git a/test1/postfix.socket b/test1/postfix.socket
deleted file mode 100644
index 9d650a15eb..0000000000
--- a/test1/postfix.socket
+++ /dev/null
@@ -1,13 +0,0 @@
-[Meta]
-Description=Postfix SMTP Socket
-
-[Socket]
-ListenStream=53333
-ListenFIFO=/tmp/systemd-postfix-fifo
-ExecStartPre=/bin/echo "About to create sockets..."
-ExecStartPre=/bin/echo "About to create sockets... 2"
-ExecStartPost=/bin/echo "Created sockets..."
-ExecStopPre=/bin/echo "About to delete sockets..."
-ExecStopPost=/bin/echo "Deleted sockets..."
-ExecStopPost=/bin/echo "Deleted sockets... 2"
-#BindToDevice=eth0
diff --git a/test1/syslog.service b/test1/syslog.service
deleted file mode 100644
index 8fe47aedba..0000000000
--- a/test1/syslog.service
+++ /dev/null
@@ -1,5 +0,0 @@
-[Meta]
-Description=System Logging Daemon
-
-[Service]
-ExecStart=/usr/bin/rsyslogd --foobar 'waldo'
diff --git a/test1/syslog.socket b/test1/syslog.socket
deleted file mode 100644
index f2d3297acd..0000000000
--- a/test1/syslog.socket
+++ /dev/null
@@ -1,8 +0,0 @@
-[Meta]
-Description=Syslog Socket
-
-[Socket]
-ListenDatagram=/tmp/foobar/waldo/systemd-syslog-socket
-ListenStream=eth0:3456
-DirectoryMode=0700
-SocketMode=0600
diff --git a/test1/systemd-logger.service b/test1/systemd-logger.service
deleted file mode 100644
index c406d26f35..0000000000
--- a/test1/systemd-logger.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Meta]
-Description=systemd Logging Daemon
-
-[Service]
-ExecStart=/home/lennart/projects/systemd/systemd-logger
-Type=simple
-TimerSlackNS=1000000
-OOMScoreAdjust=40
-LimitCORE=0
-LimitFSIZE=0
-LimitLOCKS=0
-LimitMEMLOCK=0
-LimitNOFILE=512
diff --git a/test1/systemd-logger.socket b/test1/systemd-logger.socket
deleted file mode 100644
index eb012c8dde..0000000000
--- a/test1/systemd-logger.socket
+++ /dev/null
@@ -1,5 +0,0 @@
-[Meta]
-Description=systemd Logging Socket
-
-[Socket]
-ListenStream=@/org/freedesktop/systemd1/logger