Commit 75cecfc3 authored by Simon McVittie's avatar Simon McVittie

Break up the monster conditional in config-parser so gcov can cope

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=10887Reviewed-by: Colin Walters's avatarColin Walters <walters@verbum.org>
parent 84dc815d
......@@ -1223,97 +1223,96 @@ append_rule_from_element (BusConfigParser *parser,
* Pretty sure the below stuff is broken, FIXME think about it more.
*/
if (((send_interface && send_error) ||
(send_interface && receive_interface) ||
(send_interface && receive_member) ||
(send_interface && receive_error) ||
(send_interface && receive_sender) ||
(send_interface && receive_requested_reply) ||
(send_interface && own) ||
(send_interface && user) ||
(send_interface && group)) ||
((send_member && send_error) ||
(send_member && receive_interface) ||
(send_member && receive_member) ||
(send_member && receive_error) ||
(send_member && receive_sender) ||
(send_member && receive_requested_reply) ||
(send_member && own) ||
(send_member && user) ||
(send_member && group)) ||
((send_error && receive_interface) ||
(send_error && receive_member) ||
(send_error && receive_error) ||
(send_error && receive_sender) ||
(send_error && receive_requested_reply) ||
(send_error && own) ||
(send_error && user) ||
(send_error && group)) ||
((send_destination && receive_interface) ||
(send_destination && receive_member) ||
(send_destination && receive_error) ||
(send_destination && receive_sender) ||
(send_destination && receive_requested_reply) ||
(send_destination && own) ||
(send_destination && user) ||
(send_destination && group)) ||
((send_type && receive_interface) ||
(send_type && receive_member) ||
(send_type && receive_error) ||
(send_type && receive_sender) ||
(send_type && receive_requested_reply) ||
(send_type && own) ||
(send_type && user) ||
(send_type && group)) ||
((send_path && receive_interface) ||
(send_path && receive_member) ||
(send_path && receive_error) ||
(send_path && receive_sender) ||
(send_path && receive_requested_reply) ||
(send_path && own) ||
(send_path && user) ||
(send_path && group)) ||
((send_requested_reply && receive_interface) ||
(send_requested_reply && receive_member) ||
(send_requested_reply && receive_error) ||
(send_requested_reply && receive_sender) ||
(send_requested_reply && receive_requested_reply) ||
(send_requested_reply && own) ||
(send_requested_reply && user) ||
(send_requested_reply && group)) ||
((receive_interface && receive_error) ||
(receive_interface && own) ||
(receive_interface && user) ||
(receive_interface && group)) ||
((receive_member && receive_error) ||
(receive_member && own) ||
(receive_member && user) ||
(receive_member && group)) ||
((receive_error && own) ||
(receive_error && user) ||
(receive_error && group)) ||
((eavesdrop && own) ||
(eavesdrop && user) ||
(eavesdrop && group)) ||
((receive_requested_reply && own) ||
(receive_requested_reply && user) ||
(receive_requested_reply && group)) ||
((own && user) ||
(own && group)) ||
((user && group)))
if ((send_interface && (send_error ||
receive_interface ||
receive_member ||
receive_error ||
receive_sender ||
receive_requested_reply ||
own ||
user ||
group)) ||
(send_member && (send_error ||
receive_interface ||
receive_member ||
receive_error ||
receive_sender ||
receive_requested_reply ||
own ||
user ||
group)) ||
(send_error && (receive_interface ||
receive_member ||
receive_error ||
receive_sender ||
receive_requested_reply ||
own ||
user ||
group)) ||
(send_destination && (receive_interface ||
receive_member ||
receive_error ||
receive_sender ||
receive_requested_reply ||
own ||
user ||
group)) ||
(send_type && (receive_interface ||
receive_member ||
receive_error ||
receive_sender ||
receive_requested_reply ||
own ||
user ||
group)) ||
(send_path && (receive_interface ||
receive_member ||
receive_error ||
receive_sender ||
receive_requested_reply ||
own ||
user ||
group)) ||
(send_requested_reply && (receive_interface ||
receive_member ||
receive_error ||
receive_sender ||
receive_requested_reply ||
own ||
user ||
group)) ||
(receive_interface && (receive_error ||
own ||
user ||
group)) ||
(receive_member && (receive_error ||
own ||
user ||
group)) ||
(receive_error && (own ||
user ||
group)) ||
(eavesdrop && (own ||
user ||
group)) ||
(receive_requested_reply && (own ||
user ||
group)) ||
(own && (user || group)) ||
(user && group))
{
dbus_set_error (error, DBUS_ERROR_FAILED,
"Invalid combination of attributes on element <%s>",
......
......@@ -23,10 +23,7 @@
lcov-reset:
lcov --directory @abs_top_srcdir@ --zerocounters
# gcov takes ~forever to process config-parser.c for some reason?
lcov-report:
true > bus/bus_test-config-parser.gcno
true > bus/dbus_daemon-config-parser.gcno
lcov --directory @abs_top_srcdir@ --capture \
--output-file @abs_top_builddir@/lcov.info
$(mkdir_p) @abs_top_builddir@/lcov.html
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment