tools: skip debug-gui option testing if the debug-gui is disabled
authorPeter Hutterer <peter.hutterer@who-t.net>
Mon, 24 Jun 2019 23:37:25 +0000 (09:37 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Wed, 26 Jun 2019 03:23:55 +0000 (03:23 +0000)
Fixes #311

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
meson.build
tools/test-tool-option-parsing.py

index e2af8a5..3523657 100644 (file)
@@ -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)
index 64a9ce0..594154e 100755 (executable)
@@ -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()