From d7b39f6ffbe9b46181c5597b0d0e7373eb2e9070 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 10 Jul 2020 08:50:02 +1000 Subject: 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 --- test/tool-option-parsing.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'test') 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__])) -- cgit v1.2.1