Merge commit '36f22cd28d5e' from llvm.org/master into apple/main

git apple-llvm automerger · git apple-llvm automerger · commit ce26e02442c5 · 2020-10-14T16:46:10.000+02:00
diff --git a/lldb/test/API/tools/lldb-server/memory-allocation/TestGdbRemoteMemoryAllocation.py b/lldb/test/API/tools/lldb-server/memory-allocation/TestGdbRemoteMemoryAllocation.py
@@ -6,7 +6,7 @@
 
 
 supported_linux_archs = ["x86_64", "i386"]
-supported_oses = ["linux"]
+supported_oses = ["linux", "windows"]
 
 class TestGdbRemoteMemoryAllocation(gdbremote_testcase.GdbRemoteTestCaseBase):
 
