summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2020-07-10 08:50:02 +1000
committerRan Benita <ran@unusedvar.com>2020-08-30 21:49:41 +0300
commitd7b39f6ffbe9b46181c5597b0d0e7373eb2e9070 (patch)
tree9cc4b5e240b5532c822a5f9106a983a3a8d84425 /test
parent05d6efc41723601d4d38e0c43129d2ab9d53fa48 (diff)
downloadxorg-lib-libxkbcommon-d7b39f6ffbe9b46181c5597b0d0e7373eb2e9070.tar.gz
Add /etc/xkb as extra lookup path for system data files
This completes the usual triplet of configuration locations available for most processes: - vendor-provided data files in /usr/share/X11/xkb - system-specific data files in /etc/xkb - user-specific data files in $XDG_CONFIG_HOME/xkb The default lookup order user, system, vendor, just like everything else that uses these conventions. For include directives in rules files, the '%E' resolves to that path. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'test')
-rwxr-xr-xtest/tool-option-parsing.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/tool-option-parsing.py b/test/tool-option-parsing.py
index c503176..de638d1 100755
--- a/test/tool-option-parsing.py
+++ b/test/tool-option-parsing.py
@@ -306,5 +306,7 @@ if __name__ == '__main__':
# to override it with a known (empty) directory. Otherwise our test
# behavior depends on the system the test is run on.
os.environ['XDG_CONFIG_HOME'] = tmpdir
+ # This needs to be separated if we do specific extra path testing
+ os.environ['XKB_CONFIG_EXTRA_PATH'] = tmpdir
sys.exit(pytest.main(args=[__file__]))