fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2025-12-20 06:50:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

tools: skip debug-gui option testing if the debug-gui is disabled

Browse source 
Fixes #311

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2019-06-25 09:37:25 +10:00
parent 1f59f06266
commit b12084ef76
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
meson.build
View file

@ -612,8 +612,14 @@ executable('ptraccel-debug',
# Don't run the test during a release build because we rely on the magic # Don't run the test during a release build because we rely on the magic
# subtool lookup # subtool lookup
if get_option('buildtype') == 'debug' or get_option('buildtype') == 'debugoptimized' if get_option('buildtype') == 'debug' or get_option('buildtype') == 'debugoptimized'
config_tool_option_test = configuration_data()
config_tool_option_test.set('MESON_ENABLED_DEBUG_GUI', get_option('debug-gui'))
tool_option_test = configure_file(input: 'tools/test-tool-option-parsing.py',
output: '@BASENAME@',
configuration : config_tool_option_test,
install : false)
test('tool-option-parsing', test('tool-option-parsing',
find_program('tools/test-tool-option-parsing.py'), tool_option_test,
args : ['--tool-path', libinput_tool.full_path()], args : ['--tool-path', libinput_tool.full_path()],
suite : ['all', 'root'], suite : ['all', 'root'],
timeout : 240) timeout : 240)

5
tools/test-tool-option-parsing.py
View file

@ -206,6 +206,11 @@ class TestDebugGUI(TestToolWithOptions, TestLibinputTool):
@classmethod @classmethod
def setUpClass(cls): def setUpClass(cls):
# This is set by meson
debug_gui_enabled = @MESON_ENABLED_DEBUG_GUI@
if not debug_gui_enabled:
raise unittest.SkipTest()
if not os.getenv('DISPLAY') and not os.getenv('WAYLAND_DISPLAY'): if not os.getenv('DISPLAY') and not os.getenv('WAYLAND_DISPLAY'):
raise unittest.SkipTest() raise unittest.SkipTest()