From 5cfa0506c250b018c4aefd35bc49221ce7b4ad26 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Tue, 24 Jul 2007 12:48:45 +0000 Subject: 2007-07-24 Richard Hughes * 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. --- test/Makefile.am | 4 ++++ .../org.freedesktop.DBus.TestSuiteNoExec.service.in | 4 ++++ .../org.freedesktop.DBus.TestSuiteNoService.service.in | 4 ++++ .../org.freedesktop.DBus.TestSuiteNoUser.service.in | 4 ++++ .../debug-allow-all-fail.conf.in | 17 +++++++++++++++++ .../debug-allow-all-pass.conf.in | 17 +++++++++++++++++ .../valid-config-files/debug-allow-all-sha1.conf.in | 2 +- test/data/valid-config-files/debug-allow-all.conf.in | 2 +- ...org.freedesktop.DBus.TestSuiteEchoService.service.in | 5 +++++ ...freedesktop.DBus.TestSuiteSegfaultService.service.in | 5 +++++ ...esktop.DBus.TestSuiteShellEchoServiceFail.service.in | 5 +++++ ...top.DBus.TestSuiteShellEchoServiceSuccess.service.in | 5 +++++ test/data/valid-service-files/debug-echo.service.in | 3 --- test/data/valid-service-files/debug-segfault.service.in | 4 ---- .../debug-shell-echo-fail.service.in | 3 --- .../debug-shell-echo-success.service.in | 3 --- ...org.freedesktop.DBus.TestSuiteEchoService.service.in | 4 ++++ ...freedesktop.DBus.TestSuiteSegfaultService.service.in | 4 ++++ ...esktop.DBus.TestSuiteShellEchoServiceFail.service.in | 4 ++++ ...top.DBus.TestSuiteShellEchoServiceSuccess.service.in | 4 ++++ 20 files changed, 88 insertions(+), 15 deletions(-) create mode 100644 test/data/invalid-service-files-system/org.freedesktop.DBus.TestSuiteNoExec.service.in create mode 100644 test/data/invalid-service-files-system/org.freedesktop.DBus.TestSuiteNoService.service.in create mode 100644 test/data/invalid-service-files-system/org.freedesktop.DBus.TestSuiteNoUser.service.in create mode 100644 test/data/valid-config-files-system/debug-allow-all-fail.conf.in create mode 100644 test/data/valid-config-files-system/debug-allow-all-pass.conf.in create mode 100644 test/data/valid-service-files-system/org.freedesktop.DBus.TestSuiteEchoService.service.in create mode 100644 test/data/valid-service-files-system/org.freedesktop.DBus.TestSuiteSegfaultService.service.in create mode 100644 test/data/valid-service-files-system/org.freedesktop.DBus.TestSuiteShellEchoServiceFail.service.in create mode 100644 test/data/valid-service-files-system/org.freedesktop.DBus.TestSuiteShellEchoServiceSuccess.service.in delete mode 100644 test/data/valid-service-files/debug-echo.service.in delete mode 100644 test/data/valid-service-files/debug-segfault.service.in delete mode 100644 test/data/valid-service-files/debug-shell-echo-fail.service.in delete mode 100644 test/data/valid-service-files/debug-shell-echo-success.service.in create mode 100644 test/data/valid-service-files/org.freedesktop.DBus.TestSuiteEchoService.service.in create mode 100644 test/data/valid-service-files/org.freedesktop.DBus.TestSuiteSegfaultService.service.in create mode 100644 test/data/valid-service-files/org.freedesktop.DBus.TestSuiteShellEchoServiceFail.service.in create mode 100644 test/data/valid-service-files/org.freedesktop.DBus.TestSuiteShellEchoServiceSuccess.service.in (limited to 'test') diff --git a/test/Makefile.am b/test/Makefile.am index 3420c741..56ab66fc 100644 --- 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 index 00000000..189214e6 --- /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 index 00000000..16ace268 --- /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 index 00000000..01b898cf --- /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 index 00000000..93a548ce --- /dev/null +++ b/test/data/valid-config-files-system/debug-allow-all-fail.conf.in @@ -0,0 +1,17 @@ + + + + + debug-pipe:name=test-server + unix:tmpdir=@TEST_SOCKET_DIR@ + system + @TEST_LAUNCH_HELPER_BINARY@ + @TEST_INVALID_SERVICE_SYSTEM_DIR@ + + + + + + + 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 index 00000000..5b7ffd1a --- /dev/null +++ b/test/data/valid-config-files-system/debug-allow-all-pass.conf.in @@ -0,0 +1,17 @@ + + + + + debug-pipe:name=test-server + unix:tmpdir=@TEST_SOCKET_DIR@ + system + @TEST_LAUNCH_HELPER_BINARY@ + @TEST_VALID_SERVICE_SYSTEM_DIR@ + + + + + + + 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 7fb76c55..34c50856 100644 --- 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 @@ debug-pipe:name=test-server unix:tmpdir=@TEST_SOCKET_DIR@ - @TEST_SERVICE_DIR@ + @TEST_VALID_SERVICE_DIR@ DBUS_COOKIE_SHA1 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 ea1aec8c..3514296f 100644 --- 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 @@ debug-pipe:name=test-server unix:tmpdir=@TEST_SOCKET_DIR@ - @TEST_SERVICE_DIR@ + @TEST_VALID_SERVICE_DIR@ 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 index 00000000..bd0e58e5 --- /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 index 00000000..18d16d1b --- /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 index 00000000..9195e174 --- /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 index 00000000..2236ce55 --- /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 index c22735a6..00000000 --- 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 index 73c7b55b..00000000 --- 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 index 971be60c..00000000 --- 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 index 49bf406e..00000000 --- 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 index 00000000..4202351d --- /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 index 00000000..73c7b55b --- /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 index 00000000..4404c78e --- /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 index 00000000..e5688462 --- /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" + -- cgit