2007-07-24 Richard Hughes <richard@hughsie.com>

* configure.in:
* test/Makefile.am:
* test/data/invalid-service-files-system/org.freedesktop.DBus.TestS
uiteNoExec.service.in:
* test/data/invalid-service-files-system/org.freedesktop.DBus.TestS
uiteNoService.service.in:
* test/data/invalid-service-files-system/org.freedesktop.DBus.TestS
uiteNoUser.service.in:
* test/data/valid-config-files-system/debug-allow-all-fail.conf.in:
* test/data/valid-config-files-system/debug-allow-all-pass.conf.in:
* test/data/valid-config-files/debug-allow-all-sha1.conf.in:
* test/data/valid-config-files/debug-allow-all.conf.in:
* test/data/valid-service-files-system/org.freedesktop.DBus.TestSui
teEchoService.service.in:
* test/data/valid-service-files-system/org.freedesktop.DBus.TestSui
teSegfaultService.service.in:
* test/data/valid-service-files-system/org.freedesktop.DBus.TestSui
teShellEchoServiceFail.service.in:
* test/data/valid-service-files-system/org.freedesktop.DBus.TestSui
teShellEchoServiceSuccess.service.in:
* test/data/valid-service-files/debug-echo.service.in:
* test/data/valid-service-files/debug-segfault.service.in:
* test/data/valid-service-files/debug-shell-echo-fail.service.in:
* test/data/valid-service-files/debug-shell-echo-success.service.in:
* test/data/valid-service-files/org.freedesktop.DBus.TestSuiteEchoS
ervice.service.in:
* test/data/valid-service-files/org.freedesktop.DBus.TestSuiteSegfa
ultService.service.in:
* test/data/valid-service-files/org.freedesktop.DBus.TestSuiteShell
EchoServiceFail.service.in:
* test/data/valid-service-files/org.freedesktop.DBus.TestSuiteShell
EchoServiceSuccess.service.in:
Add the data files needed by the system activation unit checks.

diff --git a/ChangeLog b/ChangeLog
index 7871603330bf4d19a6f7672a6fb326adbda4900a..c805844a3dfd445a1ca628ef5877d280ccc0fa90 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+2007-07-24  Richard Hughes  <richard@hughsie.com>
+
+       * configure.in:
+       * test/Makefile.am:
+       * test/data/invalid-service-files-system/org.freedesktop.DBus.TestS
+       uiteNoExec.service.in:
+       * test/data/invalid-service-files-system/org.freedesktop.DBus.TestS
+       uiteNoService.service.in:
+       * test/data/invalid-service-files-system/org.freedesktop.DBus.TestS
+       uiteNoUser.service.in:
+       * test/data/valid-config-files-system/debug-allow-all-fail.conf.in:
+       * test/data/valid-config-files-system/debug-allow-all-pass.conf.in:
+       * test/data/valid-config-files/debug-allow-all-sha1.conf.in:
+       * test/data/valid-config-files/debug-allow-all.conf.in:
+       * test/data/valid-service-files-system/org.freedesktop.DBus.TestSui
+       teEchoService.service.in:
+       * test/data/valid-service-files-system/org.freedesktop.DBus.TestSui
+       teSegfaultService.service.in:
+       * test/data/valid-service-files-system/org.freedesktop.DBus.TestSui
+       teShellEchoServiceFail.service.in:
+       * test/data/valid-service-files-system/org.freedesktop.DBus.TestSui
+       teShellEchoServiceSuccess.service.in:
+       * test/data/valid-service-files/debug-echo.service.in:
+       * test/data/valid-service-files/debug-segfault.service.in:
+       * test/data/valid-service-files/debug-shell-echo-fail.service.in:
+       * test/data/valid-service-files/debug-shell-echo-success.service.in:
+       * test/data/valid-service-files/org.freedesktop.DBus.TestSuiteEchoS
+       ervice.service.in:
+       * test/data/valid-service-files/org.freedesktop.DBus.TestSuiteSegfa
+       ultService.service.in:
+       * test/data/valid-service-files/org.freedesktop.DBus.TestSuiteShell
+       EchoServiceFail.service.in:
+       * test/data/valid-service-files/org.freedesktop.DBus.TestSuiteShell
+       EchoServiceSuccess.service.in:
+       Add the data files needed by the system activation unit checks.
+
 2007-07-24  Richard Hughes  <richard@hughsie.com>
 
        * bus/dispatch.c: (check_segfault_service_no_auto_start),

diff --git a/configure.in b/configure.in
index eccfc76e0bef23dc83f75d13a3c9756ed8e03e01..7e353016844b96d9c9922990e55e879757683bee 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1190,7 +1190,10 @@ AC_DEFINE_UNQUOTED(TEST_$1, "$TEST_$1",
 AC_SUBST(TEST_$1)
 ])
 
-TEST_PATH(SERVICE_DIR, data/valid-service-files)
+TEST_PATH(VALID_SERVICE_DIR, data/valid-service-files)
+TEST_PATH(INVALID_SERVICE_DIR, data/invalid-service-files)
+TEST_PATH(VALID_SERVICE_SYSTEM_DIR, data/valid-service-files-system)
+TEST_PATH(INVALID_SERVICE_SYSTEM_DIR, data/invalid-service-files-system)
 TEST_PATH(SERVICE_BINARY, test-service)
 TEST_PATH(SHELL_SERVICE_BINARY, test-shell-service)
 TEST_PATH(EXIT_BINARY, test-exit)
@@ -1254,10 +1257,19 @@ doc/Makefile
 dbus-1.pc
 test/data/valid-config-files/debug-allow-all.conf
 test/data/valid-config-files/debug-allow-all-sha1.conf
-test/data/valid-service-files/debug-echo.service
-test/data/valid-service-files/debug-segfault.service
-test/data/valid-service-files/debug-shell-echo-success.service
-test/data/valid-service-files/debug-shell-echo-fail.service
+test/data/valid-config-files-system/debug-allow-all-pass.conf
+test/data/valid-config-files-system/debug-allow-all-fail.conf
+test/data/valid-service-files/org.freedesktop.DBus.TestSuiteEchoService.service
+test/data/valid-service-files/org.freedesktop.DBus.TestSuiteSegfaultService.service
+test/data/valid-service-files/org.freedesktop.DBus.TestSuiteShellEchoServiceSuccess.service
+test/data/valid-service-files/org.freedesktop.DBus.TestSuiteShellEchoServiceFail.service
+test/data/valid-service-files-system/org.freedesktop.DBus.TestSuiteEchoService.service
+test/data/valid-service-files-system/org.freedesktop.DBus.TestSuiteSegfaultService.service
+test/data/valid-service-files-system/org.freedesktop.DBus.TestSuiteShellEchoServiceSuccess.service
+test/data/valid-service-files-system/org.freedesktop.DBus.TestSuiteShellEchoServiceFail.service
+test/data/invalid-service-files-system/org.freedesktop.DBus.TestSuiteNoExec.service
+test/data/invalid-service-files-system/org.freedesktop.DBus.TestSuiteNoUser.service
+test/data/invalid-service-files-system/org.freedesktop.DBus.TestSuiteNoService.service
 ])
 
 dnl ==========================================================================
@@ -1268,6 +1280,7 @@ echo "
        prefix:                   ${prefix}
        exec_prefix:              ${exec_prefix}
         libdir:                   ${EXPANDED_LIBDIR}
+        libexecdir:               ${EXPANDED_LIBEXECDIR}
         bindir:                   ${EXPANDED_BINDIR}
         sysconfdir:               ${EXPANDED_SYSCONFDIR}
         localstatedir:            ${EXPANDED_LOCALSTATEDIR}

diff --git a/test/Makefile.am b/test/Makefile.am
index 3420c741ad51e2cc2f699525390fb95d5f403c14..56ab66fc1631504efb6cec47e29fe8b720fd7107 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -91,11 +91,15 @@ TESTDIRS=                                   \
        data/auth                               \
        data/sha-1                              \
        data/valid-config-files                 \
+       data/valid-config-files-system          \
        data/valid-config-files/basic.d         \
        data/valid-config-files/session.d       \
        data/valid-config-files/system.d        \
        data/valid-service-files                \
+       data/valid-service-files-system         \
+       data/invalid-service-files-system       \
        data/invalid-config-files               \
+       data/invalid-config-files-system        \
        data/equiv-config-files                 \
        data/equiv-config-files/basic           \
        data/equiv-config-files/basic/basic.d   \

diff --git a/test/data/invalid-service-files-system/org.freedesktop.DBus.TestSuiteNoExec.service.in b/test/data/invalid-service-files-system/org.freedesktop.DBus.TestSuiteNoExec.service.in
new file mode 100644 (file)
index 0000000..189214e
--- /dev/null
+++ b/test/data/invalid-service-files-system/org.freedesktop.DBus.TestSuiteNoExec.service.in
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.freedesktop.DBus.TestSuiteNoExec
+User=anyrandomuser
+

diff --git a/test/data/invalid-service-files-system/org.freedesktop.DBus.TestSuiteNoService.service.in b/test/data/invalid-service-files-system/org.freedesktop.DBus.TestSuiteNoService.service.in
new file mode 100644 (file)
index 0000000..16ace26
--- /dev/null
+++ b/test/data/invalid-service-files-system/org.freedesktop.DBus.TestSuiteNoService.service.in
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Exec=@TEST_SERVICE_BINARY@
+User=anyrandomuser
+

diff --git a/test/data/invalid-service-files-system/org.freedesktop.DBus.TestSuiteNoUser.service.in b/test/data/invalid-service-files-system/org.freedesktop.DBus.TestSuiteNoUser.service.in
new file mode 100644 (file)
index 0000000..01b898c
--- /dev/null
+++ b/test/data/invalid-service-files-system/org.freedesktop.DBus.TestSuiteNoUser.service.in
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.freedesktop.DBus.TestSuiteNoUser
+Exec=@TEST_SERVICE_BINARY@
+

diff --git a/test/data/valid-config-files-system/debug-allow-all-fail.conf.in b/test/data/valid-config-files-system/debug-allow-all-fail.conf.in
new file mode 100644 (file)
index 0000000..93a548c
--- /dev/null
+++ b/test/data/valid-config-files-system/debug-allow-all-fail.conf.in
@@ -0,0 +1,17 @@
+<!-- Bus that listens on a debug pipe and doesn't create any restrictions -->
+
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <listen>debug-pipe:name=test-server</listen>
+  <listen>unix:tmpdir=@TEST_SOCKET_DIR@</listen>
+  <type>system</type>
+  <servicehelper>@TEST_LAUNCH_HELPER_BINARY@</servicehelper>
+  <servicedir>@TEST_INVALID_SERVICE_SYSTEM_DIR@</servicedir>
+  <policy context="default">
+    <allow send_interface="*"/>
+    <allow receive_interface="*"/>
+    <allow own="*"/>
+    <allow user="*"/>
+  </policy>
+</busconfig>

diff --git a/test/data/valid-config-files-system/debug-allow-all-pass.conf.in b/test/data/valid-config-files-system/debug-allow-all-pass.conf.in
new file mode 100644 (file)
index 0000000..5b7ffd1
--- /dev/null
+++ b/test/data/valid-config-files-system/debug-allow-all-pass.conf.in
@@ -0,0 +1,17 @@
+<!-- Bus that listens on a debug pipe and doesn't create any restrictions -->
+
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <listen>debug-pipe:name=test-server</listen>
+  <listen>unix:tmpdir=@TEST_SOCKET_DIR@</listen>
+  <type>system</type>
+  <servicehelper>@TEST_LAUNCH_HELPER_BINARY@</servicehelper>
+  <servicedir>@TEST_VALID_SERVICE_SYSTEM_DIR@</servicedir>
+  <policy context="default">
+    <allow send_interface="*"/>
+    <allow receive_interface="*"/>
+    <allow own="*"/>
+    <allow user="*"/>
+  </policy>
+</busconfig>

diff --git a/test/data/valid-config-files/debug-allow-all-sha1.conf.in b/test/data/valid-config-files/debug-allow-all-sha1.conf.in
index 7fb76c559e670136310dfca298bfa203d46d5b96..34c508566982bda8527dfa40224373b0089c3869 100644 (file)
--- a/test/data/valid-config-files/debug-allow-all-sha1.conf.in
+++ b/test/data/valid-config-files/debug-allow-all-sha1.conf.in
@@ -5,7 +5,7 @@
 <busconfig>
   <listen>debug-pipe:name=test-server</listen>
   <listen>unix:tmpdir=@TEST_SOCKET_DIR@</listen>
-  <servicedir>@TEST_SERVICE_DIR@</servicedir>
+  <servicedir>@TEST_VALID_SERVICE_DIR@</servicedir>
   <auth>DBUS_COOKIE_SHA1</auth>
   <policy context="default">
     <allow send_interface="*"/>

diff --git a/test/data/valid-config-files/debug-allow-all.conf.in b/test/data/valid-config-files/debug-allow-all.conf.in
index ea1aec8c0a716ee4697359c410d33148d49b64a9..3514296fd1e3e39289482f8106df8c23f21e88b7 100644 (file)
--- a/test/data/valid-config-files/debug-allow-all.conf.in
+++ b/test/data/valid-config-files/debug-allow-all.conf.in
@@ -5,7 +5,7 @@
 <busconfig>
   <listen>debug-pipe:name=test-server</listen>
   <listen>unix:tmpdir=@TEST_SOCKET_DIR@</listen>
-  <servicedir>@TEST_SERVICE_DIR@</servicedir>
+  <servicedir>@TEST_VALID_SERVICE_DIR@</servicedir>
   <policy context="default">
     <allow send_interface="*"/>
     <allow receive_interface="*"/>

diff --git a/test/data/valid-service-files-system/org.freedesktop.DBus.TestSuiteEchoService.service.in b/test/data/valid-service-files-system/org.freedesktop.DBus.TestSuiteEchoService.service.in
new file mode 100644 (file)
index 0000000..bd0e58e
--- /dev/null
+++ b/test/data/valid-service-files-system/org.freedesktop.DBus.TestSuiteEchoService.service.in
@@ -0,0 +1,5 @@
+[D-BUS Service]
+Name=org.freedesktop.DBus.TestSuiteEchoService
+Exec=@TEST_SERVICE_BINARY@
+User=anyrandomuser
+

diff --git a/test/data/valid-service-files-system/org.freedesktop.DBus.TestSuiteSegfaultService.service.in b/test/data/valid-service-files-system/org.freedesktop.DBus.TestSuiteSegfaultService.service.in
new file mode 100644 (file)
index 0000000..18d16d1
--- /dev/null
+++ b/test/data/valid-service-files-system/org.freedesktop.DBus.TestSuiteSegfaultService.service.in
@@ -0,0 +1,5 @@
+[D-BUS Service]
+Name=org.freedesktop.DBus.TestSuiteSegfaultService
+Exec=@TEST_SEGFAULT_BINARY@
+User=anyrandomuser
+

diff --git a/test/data/valid-service-files-system/org.freedesktop.DBus.TestSuiteShellEchoServiceFail.service.in b/test/data/valid-service-files-system/org.freedesktop.DBus.TestSuiteShellEchoServiceFail.service.in
new file mode 100644 (file)
index 0000000..9195e17
--- /dev/null
+++ b/test/data/valid-service-files-system/org.freedesktop.DBus.TestSuiteShellEchoServiceFail.service.in
@@ -0,0 +1,5 @@
+[D-BUS Service]
+Name=org.freedesktop.DBus.TestSuiteShellEchoServiceFail
+Exec=@TEST_SHELL_SERVICE_BINARY@ "this should 'fail' because of an unterminated quote 
+User=anyrandomuser
+

diff --git a/test/data/valid-service-files-system/org.freedesktop.DBus.TestSuiteShellEchoServiceSuccess.service.in b/test/data/valid-service-files-system/org.freedesktop.DBus.TestSuiteShellEchoServiceSuccess.service.in
new file mode 100644 (file)
index 0000000..2236ce5
--- /dev/null
+++ b/test/data/valid-service-files-system/org.freedesktop.DBus.TestSuiteShellEchoServiceSuccess.service.in
@@ -0,0 +1,5 @@
+[D-BUS Service]
+Name=org.freedesktop.DBus.TestSuiteShellEchoServiceSuccess
+Exec=@TEST_SHELL_SERVICE_BINARY@ -test "that" 'we get' back --what "we put in"
+User=anyrandomuser
+

diff --git a/test/data/valid-service-files/debug-echo.service.in b/test/data/valid-service-files/debug-echo.service.in
deleted file mode 100644 (file)
index c22735a..0000000
--- a/test/data/valid-service-files/debug-echo.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.DBus.TestSuiteEchoService
-Exec=@TEST_SERVICE_BINARY@

diff --git a/test/data/valid-service-files/debug-segfault.service.in b/test/data/valid-service-files/debug-segfault.service.in
deleted file mode 100644 (file)
index 73c7b55..0000000
--- a/test/data/valid-service-files/debug-segfault.service.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.DBus.TestSuiteSegfaultService
-Exec=@TEST_SEGFAULT_BINARY@
-

diff --git a/test/data/valid-service-files/debug-shell-echo-fail.service.in b/test/data/valid-service-files/debug-shell-echo-fail.service.in
deleted file mode 100644 (file)
index 971be60..0000000
--- a/test/data/valid-service-files/debug-shell-echo-fail.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.DBus.TestSuiteShellEchoServiceFail
-Exec=@TEST_SHELL_SERVICE_BINARY@ "this should 'fail' because of an unterminated quote 

diff --git a/test/data/valid-service-files/debug-shell-echo-success.service.in b/test/data/valid-service-files/debug-shell-echo-success.service.in
deleted file mode 100644 (file)
index 49bf406..0000000
--- a/test/data/valid-service-files/debug-shell-echo-success.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.DBus.TestSuiteShellEchoServiceSuccess
-Exec=@TEST_SHELL_SERVICE_BINARY@ -test "that" 'we get' back --what "we put in"

diff --git a/test/data/valid-service-files/org.freedesktop.DBus.TestSuiteEchoService.service.in b/test/data/valid-service-files/org.freedesktop.DBus.TestSuiteEchoService.service.in
new file mode 100644 (file)
index 0000000..4202351
--- /dev/null
+++ b/test/data/valid-service-files/org.freedesktop.DBus.TestSuiteEchoService.service.in
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.freedesktop.DBus.TestSuiteEchoService
+Exec=@TEST_SERVICE_BINARY@
+

diff --git a/test/data/valid-service-files/org.freedesktop.DBus.TestSuiteSegfaultService.service.in b/test/data/valid-service-files/org.freedesktop.DBus.TestSuiteSegfaultService.service.in
new file mode 100644 (file)
index 0000000..73c7b55
--- /dev/null
+++ b/test/data/valid-service-files/org.freedesktop.DBus.TestSuiteSegfaultService.service.in
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.freedesktop.DBus.TestSuiteSegfaultService
+Exec=@TEST_SEGFAULT_BINARY@
+

diff --git a/test/data/valid-service-files/org.freedesktop.DBus.TestSuiteShellEchoServiceFail.service.in b/test/data/valid-service-files/org.freedesktop.DBus.TestSuiteShellEchoServiceFail.service.in
new file mode 100644 (file)
index 0000000..4404c78
--- /dev/null
+++ b/test/data/valid-service-files/org.freedesktop.DBus.TestSuiteShellEchoServiceFail.service.in
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.freedesktop.DBus.TestSuiteShellEchoServiceFail
+Exec=@TEST_SHELL_SERVICE_BINARY@ "this should 'fail' because of an unterminated quote 
+

diff --git a/test/data/valid-service-files/org.freedesktop.DBus.TestSuiteShellEchoServiceSuccess.service.in b/test/data/valid-service-files/org.freedesktop.DBus.TestSuiteShellEchoServiceSuccess.service.in
new file mode 100644 (file)
index 0000000..e568846
--- /dev/null
+++ b/test/data/valid-service-files/org.freedesktop.DBus.TestSuiteShellEchoServiceSuccess.service.in
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.freedesktop.DBus.TestSuiteShellEchoServiceSuccess
+Exec=@TEST_SHELL_SERVICE_BINARY@ -test "that" 'we get' back --what "we put in"
+