diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2017-01-17 21:07:00 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2017-04-07 12:08:37 +0100 |
| commit | cb5a37b53bc51917cb42ea49fbc6e20f8c7d784a (patch) | |
| tree | 6f9c72ebc1770bb58b621f669100c43aa5d7644d /bus | |
| parent | 4a9083ff39e7986380cd86d1aff11e7658d7455d (diff) | |
| download | dbus-cb5a37b53bc51917cb42ea49fbc6e20f8c7d784a.tar.gz | |
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
Diffstat (limited to 'bus')
| -rw-r--r-- | bus/config-parser.c | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/bus/config-parser.c b/bus/config-parser.c index c8d026f9..7b3aabb2 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; } |