[lldb] [test] Avoid double negations in llgs/debugserver logic

[mgorny]

Summary

Use positive logic (i.e. llgs_platform/debugserver_platform) for
indicating which platforms use the particular server variant.
Deduplicate the lists — it is rather expected that none of the platforms
using LLGS would use debugserver.

[mgorny]

lldb/packages/Python/lldbsuite/test/dotest.py

954

@labath, can we assume that all future platforms will use LLGS?

[labath]

lldb/packages/Python/lldbsuite/test/dotest.py

951

This is not entirely equivalent to the previous version -- it won't match "platforms" like "freebsd4.7". Fortunately, we already have some canonicalization code in lldbplatformutil.getPlatform(), so if you switch to that, it should be fine.

954

I certainly hope so. I doubt anyone would port debugserver to another os, and I definitely would not want to carry another debugserver around.

[mgorny]

lldb/packages/Python/lldbsuite/test/dotest.py

951

Good catch! However, this doesn't seem to work:

Command Output (stderr):
--
Traceback (most recent call last):
  File "/home/mgorny/llvm-project/llvm/tools/lldb/test/API/dotest.py", line 7, in <module>
    lldbsuite.test.run_suite()
  File "/usr/home/mgorny/llvm-project/lldb/packages/Python/lldbsuite/test/dotest.py", line 855, in run_suite
    from lldbsuite.test import lldbplatformutil
  File "/usr/home/mgorny/llvm-project/lldb/packages/Python/lldbsuite/test/lldbplatformutil.py", line 19, in <module>
    import lldb
ModuleNotFoundError: No module named 'lldb'

--

There is apparently some obscure problem behind the scenes and it seems above my pay grade. I'll just revert to the old code.

954

Ok, I will remove the comment about adding more platforms then.

[mgorny]

Removed the part about adding new platforms without LLGS, and restored old conditions for matching platforms.

[labath]

lldb/packages/Python/lldbsuite/test/dotest.py

951

This is fiddly, because all of this happens very early, before everything is set up.
You've tried to import this package much too early. The paths necessary for "import lldb" to work are only set up on line 869 (setupSysPath()). And lldb.selected_platform is only set on line ~931. You need to put the import statement after those -- say line 941, to replace the manual triple chopping...

[mgorny]

Used lldbplatformutil.getPlatform() as requested.

lldb/packages/Python/lldbsuite/test/decorators.py

def should_skip_simulator_test():
             return "Simulators are unsupported on this system (xcodebuild failed)"
 
     return skipTestIfFn(should_skip_simulator_test)
 
 
 def debugserver_test(func):
     """Decorate the item as a debugserver test."""
     def should_skip_debugserver_test():
-        return "debugserver tests" if configuration.dont_do_debugserver_test else None
+        return ("debugserver tests"
+                if not configuration.debugserver_platform
+                else None)
     return skipTestIfFn(should_skip_debugserver_test)(func)
 
 
 def llgs_test(func):
     """Decorate the item as a lldb-server test."""
     def should_skip_llgs_tests():
-        return "llgs tests" if configuration.dont_do_llgs_test else None
+        return ("llgs tests"
+                if not configuration.llgs_platform
+                else None)
     return skipTestIfFn(should_skip_llgs_tests)(func)
 
 
 def not_remote_testsuite_ready(func):
     """Decorate the item as a test which is not ready yet for remote testsuite."""
     def is_remote():
         return "Not ready for remote testsuite" if lldb.remote_platform else None
     return skipTestIfFn(is_remote)(func)

lldb/packages/Python/lldbsuite/test/dotest.py

else:
         lldb.remote_platform = None
         configuration.lldb_platform_working_dir = None
         configuration.lldb_platform_url = None
 
     # Set up the working directory.
     # Note that it's not dotest's job to clean this directory.
     lldbutil.mkdir_p(configuration.test_build_dir)
 
-    target_platform = lldb.selected_platform.GetTriple().split('-')[2]
+    from . import lldbplatformutil
+    target_platform = lldbplatformutil.getPlatform()
 
     checkLibcxxSupport()
     checkLibstdcxxSupport()
     checkWatchpointSupport()
     checkDebugInfoSupport()
 
-    # Don't do debugserver tests on anything except OS X.
-    configuration.dont_do_debugserver_test = (
-            "linux" in target_platform or
-            "freebsd" in target_platform or
-            "netbsd" in target_platform or
-            "windows" in target_platform)
-
-    # Don't do lldb-server (llgs) tests on platforms not supporting it.
-    configuration.dont_do_llgs_test = not (
-            "freebsd" in target_platform or
-            "linux" in target_platform or
-            "netbsd" in target_platform or
-            "windows" in target_platform)
+    # Perform LLGS tests only on platforms using it.
+    configuration.llgs_platform = (
+        target_platform in ["freebsd", "linux", "netbsd", "windows"])
+
+    # Perform debugserver tests elsewhere (i.e. on Darwin platforms).
+    configuration.debugserver_platform = not configuration.llgs_platform
 
     for testdir in configuration.testdirs:
         for (dirpath, dirnames, filenames) in os.walk(testdir):
             visit('Test', dirpath, filenames)
 
     #
     # Now that we have loaded all the test cases, run the whole test suite.
     #