tests: strip 'XType' warnings in '-?' usage test

On macOS, Smyrna prints some warnings prior to the usage text:

  2022-03-26 19:32:21.216 smyrna[70079:124370] XType: com.apple.fonts is not
    accessible.
  2022-03-26 19:32:21.216 smyrna[70079:124370] XType: XTFontStaticRegistry is
    enabled.
  Usage: smyrna [-v?] <file>

Gitlab: related to #1836, #1854

diff --git a/rtest/test_tools.py b/rtest/test_tools.py
index ea98b3a695d88cfbf85dc10ff3d93c94e7d1d9b3..efc402fd1d155917b7db49e441208b1ec0c93eea 100644 (file)
--- a/rtest/test_tools.py
+++ b/rtest/test_tools.py
@@ -15,7 +15,7 @@ import sys
 import pytest
 
 sys.path.append(os.path.dirname(__file__))
-from gvtest import is_cmake #pylint: disable=C0413
+from gvtest import is_cmake, remove_xtype_warnings #pylint: disable=C0413
 
 @pytest.mark.parametrize("tool", [
     "acyclic",
@@ -106,6 +106,7 @@ def test_tools(tool):
 
   assert ret == 0, f"`{tool} -?` failed. Output was: {output}"
 
+  output = remove_xtype_warnings(output)
   assert re.match("usage", output, flags=re.IGNORECASE) is not None, \
     f"{tool} -? did not show usage. Output was: {output}"