Commit b12084ef authored by Peter Hutterer's avatar Peter Hutterer

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

Fixes #311
Signed-off-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
parent 1f59f062
Pipeline #44870 passed with stages
in 3 minutes and 9 seconds
......@@ -612,8 +612,14 @@ executable('ptraccel-debug',
# Don't run the test during a release build because we rely on the magic
# subtool lookup
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',
find_program('tools/test-tool-option-parsing.py'),
tool_option_test,
args : ['--tool-path', libinput_tool.full_path()],
suite : ['all', 'root'],
timeout : 240)
......
......@@ -206,6 +206,11 @@ class TestDebugGUI(TestToolWithOptions, TestLibinputTool):
@classmethod
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'):
raise unittest.SkipTest()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment