diff options
| author | Simon McVittie <smcv@debian.org> | 2013-04-25 13:47:35 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2013-04-25 13:47:35 +0100 |
| commit | 05b847b89bcf23c7805e1519cdd16a2aeb16d14b (patch) | |
| tree | 0050703932730b59be75a32f54971865abec0495 /test | |
| parent | 4b6f5d684fc302b10fa2471597c0b276d8ef9885 (diff) | |
| parent | 7ff0cd0640b906821f9b222924e2545b25d28c0f (diff) | |
| download | dbus-05b847b89bcf23c7805e1519cdd16a2aeb16d14b.tar.gz | |
Imported Upstream version 1.7.2upstream/1.7.2
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.in | 1 | ||||
| -rw-r--r-- | test/internals/syslog.c | 6 | ||||
| -rw-r--r-- | test/name-test/Makefile.in | 1 | ||||
| -rw-r--r-- | test/syntax.c | 6 |
4 files changed, 9 insertions, 5 deletions
diff --git a/test/Makefile.in b/test/Makefile.in index a5a6fe6a..57e8594e 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -329,6 +329,7 @@ DBUS_USER = @DBUS_USER@ DBUS_VERSION = @DBUS_VERSION@ DBUS_X_CFLAGS = @DBUS_X_CFLAGS@ DBUS_X_LIBS = @DBUS_X_LIBS@ +DEFAULT_MESSAGE_UNIX_FDS = @DEFAULT_MESSAGE_UNIX_FDS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ diff --git a/test/internals/syslog.c b/test/internals/syslog.c index 4f6b7c22..658281cb 100644 --- a/test/internals/syslog.c +++ b/test/internals/syslog.c @@ -54,7 +54,7 @@ test_syslog (Fixture *f, { if (g_test_trap_fork (0, 0)) { - _dbus_init_system_log (); + _dbus_init_system_log (FALSE); _dbus_system_log (DBUS_SYSTEM_LOG_FATAL, MESSAGE "%d", 23); /* should not be reached: exit 0 so the assertion in the main process * will fail */ @@ -66,7 +66,7 @@ test_syslog (Fixture *f, if (g_test_trap_fork (0, 0)) { - _dbus_init_system_log (); + _dbus_init_system_log (FALSE); _dbus_system_log (DBUS_SYSTEM_LOG_INFO, MESSAGE "%d", 42); _dbus_system_log (DBUS_SYSTEM_LOG_SECURITY, MESSAGE "%d", 666); exit (0); @@ -76,7 +76,7 @@ test_syslog (Fixture *f, g_test_trap_assert_stderr ("*" MESSAGE "42\n*" MESSAGE "666\n*"); /* manual test (this is the best we can do on Windows) */ - _dbus_init_system_log (); + _dbus_init_system_log (FALSE); _dbus_system_log (DBUS_SYSTEM_LOG_INFO, MESSAGE "%d", 42); _dbus_system_log (DBUS_SYSTEM_LOG_SECURITY, MESSAGE "%d", 666); } diff --git a/test/name-test/Makefile.in b/test/name-test/Makefile.in index 4f2e756b..e41785bf 100644 --- a/test/name-test/Makefile.in +++ b/test/name-test/Makefile.in @@ -207,6 +207,7 @@ DBUS_USER = @DBUS_USER@ DBUS_VERSION = @DBUS_VERSION@ DBUS_X_CFLAGS = @DBUS_X_CFLAGS@ DBUS_X_LIBS = @DBUS_X_LIBS@ +DEFAULT_MESSAGE_UNIX_FDS = @DEFAULT_MESSAGE_UNIX_FDS@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ diff --git a/test/syntax.c b/test/syntax.c index 88db9638..e26b3643 100644 --- a/test/syntax.c +++ b/test/syntax.c @@ -178,12 +178,14 @@ const char * const invalid_single_signatures[] = { const char * const valid_strings[] = { "", - "\xc2\xa9", + "\xc2\xa9", /* UTF-8 (c) symbol */ + "\xef\xbf\xbe", /* U+FFFE is reserved but Corrigendum 9 says it's OK */ NULL }; const char * const invalid_strings[] = { - "\xa9", + "\xa9", /* Latin-1 (c) symbol */ + "\xed\xa0\x80", /* UTF-16 surrogates are not valid in UTF-8 */ NULL }; |