From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 17 Jan 2017 21:07:00 +0000 (+0000)
Subject: config-parser tests: explicitly skip non-comparable elements
X-Git-Tag: dbus-1.11.12~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cb5a37b53bc51917cb42ea49fbc6e20f8c7d784a;p=thirdparty%2Fdbus.git

config-parser tests: explicitly skip non-comparable elements

For these types, the tagged union in the Element struct does not store
anything we could usefuly compare.

Based on part of a patch from Thomas Zimmermann.

Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=98191
---

diff --git a/bus/config-parser.c b/bus/config-parser.c
index c8d026f9e..7b3aabb2c 100644
--- a/bus/config-parser.c
+++ b/bus/config-parser.c
@@ -3268,8 +3268,29 @@ elements_equal (const Element *a,
 	return FALSE;
       break;
 
+    case ELEMENT_NONE:
+    case ELEMENT_BUSCONFIG:
+    case ELEMENT_USER:
+    case ELEMENT_LISTEN:
+    case ELEMENT_AUTH:
+    case ELEMENT_ALLOW:
+    case ELEMENT_DENY:
+    case ELEMENT_FORK:
+    case ELEMENT_PIDFILE:
+    case ELEMENT_SERVICEDIR:
+    case ELEMENT_SERVICEHELPER:
+    case ELEMENT_INCLUDEDIR:
+    case ELEMENT_CONFIGTYPE:
+    case ELEMENT_SELINUX:
+    case ELEMENT_ASSOCIATE:
+    case ELEMENT_STANDARD_SESSION_SERVICEDIRS:
+    case ELEMENT_STANDARD_SYSTEM_SERVICEDIRS:
+    case ELEMENT_KEEP_UMASK:
+    case ELEMENT_SYSLOG:
+    case ELEMENT_ALLOW_ANONYMOUS:
+    case ELEMENT_APPARMOR:
     default:
-      /* do nothing */
+      /* do nothing: nothing in the Element struct for these types */
       break;
     }