summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-12-05Add version info to installed executables for cmake build system on WindowsHEADmasterRalf Habacker6-13/+78
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103387 Signed-off-by: Ralf Habacker <ralf.habacker@freenet.de>
2017-12-04_dbus_test_oom_handling: print TAP diagnosticsSimon McVittie1-8/+14
These aren't *that* verbose, so it seems OK to print them all the time, not just in the needlessly spammy verbose mode. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=100317 Reviewed-by: Philip Withnall <withnall@endlessm.com> Signed-off-by: Simon McVittie <smcv@collabora.com>
2017-12-04tests: Add the ability to multiply up test timeoutsSimon McVittie5-11/+12
Tests that brute-force OOM code paths can be rather slow. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=100317 Reviewed-by: Philip Withnall <withnall@endlessm.com> Signed-off-by: Simon McVittie <smcv@collabora.com>
2017-12-04test-utils: Separate failable and non-failable functionsSimon McVittie10-26/+54
test_object_try_whatever() now has libdbus-like OOM handling, while test_object_whatever() has GLib-like OOM handling. This is because an overwhelming majority of the callers of these functions either didn't check for OOM anyway, or checked for it but then aborted. In the uncommon case where we do care, we can use the _try_ version. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=100317 Reviewed-by: Philip Withnall <withnall@endlessm.com> Signed-off-by: Simon McVittie <smcv@collabora.com>
2017-12-04test_connection_setup: Don't crash on unlikely OOMSimon McVittie1-1/+5
If _dbus_loop_queue_dispatch fails with OOM, we'd try to free cd, while cd is already owned by the connection's timeout functions. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=100317 Reviewed-by: Philip Withnall <withnall@endlessm.com> Signed-off-by: Simon McVittie <smcv@collabora.com>
2017-12-04test_try_connect_to_bus: Cope with OOM while setting up connectionSimon McVittie1-1/+6
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=100317 Reviewed-by: Philip Withnall <withnall@endlessm.com> Signed-off-by: Simon McVittie <smcv@collabora.com>
2017-12-04test_try_connect_to_bus: Don't leak the connection on OOMSimon McVittie1-0/+6
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=100317 Reviewed-by: Philip Withnall <withnall@endlessm.com> Signed-off-by: Simon McVittie <smcv@collabora.com>
2017-12-04dbus_message_demarshal: Set error if we can't allocate the loaderSimon McVittie1-3/+6
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=100317 Reviewed-by: Philip Withnall <withnall@endlessm.com> Signed-off-by: Simon McVittie <smcv@collabora.com>
2017-12-04DBusHeader: Add a diagram of the headerSimon McVittie2-4/+54
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=100317 Reviewed-by: Philip Withnall <withnall@endlessm.com> Signed-off-by: Simon McVittie <smcv@collabora.com>
2017-12-04_dbus_header_load: Operate on the entire string, not a substringSimon McVittie3-19/+14
This function worked with a (string,position,length) triple, but it turns out to only have one caller, which tells it to look at the entire string anyway. It'll be easier to document if all the offsets start from 0. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=100317 Reviewed-by: Philip Withnall <withnall@endlessm.com> Signed-off-by: Simon McVittie <smcv@collabora.com>
2017-11-27_dbus_server_new_for_socket: Iterate over arrays as intendedSimon McVittie1-4/+4
Commit 0c03b505 was meant to clear all the fds indexed by j in [0, n_fds), which socket_disconnect() can't be allowed to close (because on failure the caller remains responsible for closing them); but instead it closed the one we failed to add to the main loop (fd i), repeatedly. Similarly, it was meant to invalidate all the watches indexed by j in [i, n_fds) (the one we failed to add to the main loop and the ones we didn't try to add to the main loop yet), which socket_disconnect() can't be allowed to see (because it would fail to remove them from the main loop and hit an assertion failure); but instead it invalidated fd i, repeatedly. These happen to be the same thing if you only have one fd, resulting in the test-case passing on an IPv4-only system, but failing on a system with both IPv4 and IPv6. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89104 Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com>
2017-11-24NEWS for 1.13.xSimon McVittie1-0/+27
Signed-off-by: Simon McVittie <smcv@collabora.com>
2017-11-24tests: Use test_main_context_call_and_waitSimon McVittie4-427/+94
Also use test_oom() where the relevant lines are changing anyway. Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103600
2017-11-24test_main_context_call_and_wait: AddSimon McVittie3-2/+45
Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103600
2017-11-24test-utils: Use TAP syntax to die with a fatal errorSimon McVittie1-1/+2
Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103600
2017-11-24tests: Don't use the same variable for call and replySimon McVittie4-225/+205
It seemed like a nice idea at the time, but I now think it's more confusing than it's worth. Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103600
2017-11-24test/sd-activation: Make more use of dbus_clear_message()Simon McVittie1-18/+11
Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103600
2017-11-24tests: Don't leak pending callsSimon McVittie2-0/+11
Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103600
2017-11-24test/dbus-daemon: Don't leak method call messages if we skip testsSimon McVittie1-24/+48
Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103600
2017-11-24test_peer_ping: Don't leak one method call per invocationSimon McVittie1-2/+1
Previously, we allocated m both during initialization, and after deciding not to skip this test. Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103600
2017-11-24_dbus_server_new_for_tcp_socket: Simplify error unwindingSimon McVittie1-22/+19
Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89104
2017-11-24_dbus_server_new_for_socket: Simplify error unwindingSimon McVittie1-19/+22
Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89104
2017-11-24Add a targeted test for OOM during _dbus_server_new_for_tcp_socket()Simon McVittie3-0/+154
This also covers _dbus_server_new_for_socket(), which is one of the worse places in terms of complexity of the error-unwinding path (3 labels). Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89104
2017-11-24dbus-nonce: Don't crash on encountering OOMSimon McVittie1-0/+5
Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89104
2017-11-24_dbus_listen_tcp_socket: Don't rely on dbus_realloc setting errnoSimon McVittie1-4/+2
dbus_realloc() doesn't guarantee to set errno (if it did, the only reasonable thing it could set it to would be ENOMEM). In particular, faking OOM conditions doesn't set it. This can cause an assertion failure when OOM tests assert that the only error that can validly occur is DBUS_ERROR_NO_MEMORY. Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89104
2017-11-24_dbus_server_new_for_tcp_socket: Don't pile up errors on OOMSimon McVittie1-2/+4
If _dbus_noncefile_create() has failed and set error, it is incorrect for us to set it again. Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89104
2017-11-24_dbus_server_new_for_launchd: Don't leak fd on failureSimon McVittie1-1/+4
If _dbus_server_new_for_socket() fails, it is the caller's responsibility to close the fds. All other callers did this. Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89104
2017-11-24_dbus_server_new_for_socket: Properly disconnect during error unwindingSimon McVittie3-14/+38
_dbus_server_finalize_base() asserts that the socket has been disconnected, but in some OOM code paths we would call it without officially disconnecting. Do so. This means we need to be a bit more careful about what is socket_disconnect()'s responsibility to clean up, what is _dbus_server_new_for_socket()'s responsibility, and what is the caller's responsibility. Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89104
2017-11-24_dbus_server_new_for_socket: Invalidate watches during error unwindingSimon McVittie1-0/+1
We assert that every watch is invalidated before it is freed, but in some OOM code paths this didn't happen. Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89104
2017-11-24_dbus_transport_new_for_socket: Simplify with _DBUS_STRING_INIT_INVALIDSimon McVittie1-15/+24
This is one of the few places that has test coverage for all the OOM code paths. It was also one of the worst (most complicated) error-unwinding locations, with labels failed_0 up to failed_4. Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89104
2017-11-24DBusString: Add _DBUS_STRING_INIT_INVALID and allow "freeing" itSimon McVittie3-4/+45
This means we can finally use patterns like this: DBusString buffer = _DBUS_STRING_INIT_INVALID; dbus_bool_t ret = FALSE; ... some long setup ... if (!_dbus_string_init (&buffer)) goto out; ... some long operation ... ret = TRUE; out: ... free things ... _dbus_string_free (&buffer); ... free more things ... return ret; without having to have a separate boolean to track whether buffer has been initialized. One observable difference is that if s is a "const" (borrowed pointer) string, _dbus_string_free (&s) now sets it to be invalid. Previously, it would have kept its (borrowed pointer) contents, which seems like a violation of least-astonishment. Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89104
2017-11-24DBusString: Reverse the sense of ->invalidSimon McVittie4-7/+7
It's easier to implement a stack-allocated string that is valid to free (but for no other purpose) if we consider all-bits-zero to be invalid. Signed-off-by: Simon McVittie <smcv@collabora.com> Reviewed-by: Philip Withnall <withnall@endlessm.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89104
2017-11-15Remove references to test/data/incomplete-messages tooSimon McVittie2-7/+0
Signed-off-by: Simon McVittie <smcv@collabora.com>
2017-11-15tests: Remove leftover references to valid-messages directorySimon McVittie2-8/+0
Now that the directory doesn't exist in git, the embedded tests fail in a clean git checkout. Signed-off-by: Simon McVittie <smcv@collabora.com>
2017-11-15Update NEWS for 1.13.x test changesSimon McVittie1-0/+7
Signed-off-by: Simon McVittie <smcv@collabora.com>
2017-11-15Remove test data in the "message builder" domain-specific languageSimon McVittie33-965/+2
These tests were disabled by commit 9c3d566, which rewrote the D-Bus type system to be fully recursive, back in 2005. The message builder was subsequently removed by commit 9d21554, also in early 2005. It will probably take significant work to turn these files into test-cases that use the current D-Bus type system and so can be run this decade. Until that work is done, let's not ship them: we can always fetch them from git history if we want them. The single .message-raw file can still be read and has been retained, although it hasn't actually tested the intended failure mode since 2005 due to changes to the D-Bus specification (it is a wire-protocol version 0 message, and the recursive type system introduced in commit 9c3d566 changed the wire-protocol version to 1). Reviewed-by: Philip Withnall <withnall@endlessm.com> Signed-off-by: Simon McVittie <smcv@collabora.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103758
2017-11-15_dbus_test_diag: Flush stdout after each diagnosticSimon McVittie1-0/+1
If we crash, we'll want to know what the most recent diagnostic was. Reviewed-by: Philip Withnall <withnall@endlessm.com> Signed-off-by: Simon McVittie <smcv@collabora.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103601
2017-11-15dispatch test: Output finer-grained TAPSimon McVittie1-4/+34
This lets us see which bits are painfully slow. (Spoilers: check_existent_service_no_auto_start.) Reviewed-by: Philip Withnall <withnall@endlessm.com> Signed-off-by: Simon McVittie <smcv@collabora.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103601
2017-11-15test-bus*: Output TAP directlySimon McVittie4-133/+48
Reviewed-by: Philip Withnall <withnall@endlessm.com> Signed-off-by: Simon McVittie <smcv@collabora.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103601
2017-11-15test-dbus: Produce machine-readable TAP outputSimon McVittie6-45/+190
See http://testanything.org/ for more information on TAP. Reviewed-by: Philip Withnall <withnall@endlessm.com> Signed-off-by: Simon McVittie <smcv@collabora.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103601
2017-11-15bus: Silence the output of the test services when doing OOM testingSimon McVittie5-13/+38
The echo service frequently fails to connect to the bus when we are testing OOM code paths, again causing a lot of noise in the log. Reviewed-by: Philip Withnall <withnall@endlessm.com> Signed-off-by: Simon McVittie <smcv@collabora.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103601
2017-11-15bus: Silence most log messages when testing OOM handlingSimon McVittie13-31/+88
In parts of the OOM testing, our logging produces multiple megabytes of output. Let's not do that. Reviewed-by: Philip Withnall <withnall@endlessm.com> Signed-off-by: Simon McVittie <smcv@collabora.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103601
2017-11-15Unix: Flush stdout and stderr streams before forkingSimon McVittie6-3/+57
stdout and stderr are close-on-exec and buffered, so we can't rely on their buffers being empty. If we continue to execute application code after forking (as opposed to immediately exec()ing), then the child process might later flush the libc stdio buffers, resulting in output that is printed by the parent also being printed by the child. In particular, test-bus.log sometimes grows extremely large for this reason, because this test repeatedly attempts to carry out legacy activation. Reviewed-by: Philip Withnall <withnall@endlessm.com> Signed-off-by: Simon McVittie <smcv@collabora.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103601
2017-11-15Prefer to use _dbus_test_fatal() for assertion failures in testsSimon McVittie28-552/+563
This is a little more self-documenting - it justifies why it's acceptable to fail hard on out-of-memory conditions. _dbus_test_fatal() isn't compiled unless we are compiling embedded tests, so compiling with embedded tests disabled provides reasonable confidence that we aren't using _dbus_test_fatal() inappropriately. Reviewed-by: Philip Withnall <withnall@endlessm.com> Signed-off-by: Simon McVittie <smcv@collabora.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103601
2017-11-15Use _dbus_test_fatal to include more detail in test failure diagnosticsSimon McVittie6-124/+41
Unlike _dbus_assert_not_reached(), this new function takes a printf-style format string, so we don't need to use a _dbus_warn() to explain why the failure occurred (unless the failure message is multi-line). Reviewed-by: Philip Withnall <withnall@endlessm.com> Signed-off-by: Simon McVittie <smcv@collabora.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103601
2017-11-15Embedded tests: Emit TAP diagnostics instead of printfSimon McVittie16-169/+141
Reviewed-by: Philip Withnall <withnall@endlessm.com> Signed-off-by: Simon McVittie <smcv@collabora.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103601
2017-11-15Add utility functions to emit TAP diagnostics and fatal errorsSimon McVittie4-0/+125
Reviewed-by: Philip Withnall <withnall@endlessm.com> [smcv: Add an explanatory comment as suggested] Signed-off-by: Simon McVittie <smcv@collabora.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103601
2017-11-15Do not export dbus_internal_do_not_use_run_tests if unusedSimon McVittie1-6/+1
Reviewed-by: Philip Withnall <withnall@endlessm.com> Signed-off-by: Simon McVittie <smcv@collabora.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103601
2017-11-15Windows autolaunch: Turn stdout spam into stderr spamSimon McVittie1-2/+2
This is still not how warnings and diagnostics should be done (the advice should probably be included in the DBusError) but at least this way it won't interfere with machine-readable output on stdout. See also https://bugs.freedesktop.org/show_bug.cgi?id=103756 Reviewed-by: Philip Withnall <withnall@endlessm.com> [smcv: Added a reference to #103756] Signed-off-by: Simon McVittie <smcv@collabora.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103601
2017-11-15Remove commented-out printf debuggingSimon McVittie3-36/+0
Printing to stdout would interfere with generating TAP syntax. Reviewed-by: Philip Withnall <withnall@endlessm.com> Signed-off-by: Simon McVittie <smcv@collabora.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103601
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-21 10:11:45 +0000