[Lldb-commits] [lldb] 453f8c8 - [lldb] Remove lldb/lldb subdir created by wrong patch level

[Jonas Devlieghere via lldb-commits]

Author: Jonas Devlieghere
Date: 2022-03-18T09:06:15-07:00
New Revision: 453f8c87ff20932c79890d93474e862d52f6fe46

URL: https://github.com/llvm/llvm-project/commit/453f8c87ff20932c79890d93474e862d52f6fe46
DIFF: https://github.com/llvm/llvm-project/commit/453f8c87ff20932c79890d93474e862d52f6fe46.diff

LOG: [lldb] Remove lldb/lldb subdir created by wrong patch level

Bad application of patch -p<level>.

Added: 
    

Modified: 
    

Removed: 
    lldb/lldb/test/API/functionalities/gdb_remote_client/TestPlatformMacOSX.py
    lldb/lldb/unittests/Platform/PlatformMacOSXTest.cpp


################################################################################
diff  --git a/lldb/lldb/test/API/functionalities/gdb_remote_client/TestPlatformMacOSX.py b/lldb/lldb/test/API/functionalities/gdb_remote_client/TestPlatformMacOSX.py
deleted file mode 100644
index 3d3de0a9707c0..0000000000000
--- a/lldb/lldb/test/API/functionalities/gdb_remote_client/TestPlatformMacOSX.py
+++ /dev/null
@@ -1,60 +0,0 @@
-import lldb
-from lldbsuite.test.lldbtest import *
-from lldbsuite.test.decorators import *
-from lldbsuite.test.gdbclientutils import *
-from lldbsuite.test.lldbgdbclient import GDBRemoteTestBase
-
-
-class TestPlatformMacOSX(GDBRemoteTestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    class MyResponder(MockGDBServerResponder):
-
-        def __init__(self, host):
-            self.host_ostype = host
-            MockGDBServerResponder.__init__(self)
-
-        def respond(self, packet):
-            if packet == "qProcessInfo":
-                return self.qProcessInfo()
-            return MockGDBServerResponder.respond(self, packet)
-
-        def qHostInfo(self):
-            return "cputype:16777223;cpusubtype:2;ostype:%s;vendor:apple;os_version:10.15.4;maccatalyst_version:13.4;endian:little;ptrsize:8;" % self.host_ostype
-
-        def qProcessInfo(self):
-            return "pid:a860;parent-pid:d2a0;real-uid:1f5;real-gid:14;effective-uid:1f5;effective-gid:14;cputype:100000c;cpusubtype:2;ptrsize:8;ostype:ios;vendor:apple;endian:little;"
-
-        def vCont(self):
-            return "vCont;"
-
-    def platform_test(self, host, expected_triple, expected_platform):
-        self.server.responder = self.MyResponder(host)
-        if self.TraceOn():
-            self.runCmd("log enable gdb-remote packets")
-            self.addTearDownHook(
-                lambda: self.runCmd("log disable gdb-remote packets"))
-
-        target = self.dbg.CreateTargetWithFileAndArch(None, None)
-        process = self.connect(target)
-
-        triple = target.GetTriple()
-        self.assertEqual(triple, expected_triple)
-
-        platform = target.GetPlatform()
-        self.assertEqual(platform.GetName(), expected_platform)
-
-    @skipIfRemote
-    def test_ios(self):
-        self.platform_test(host="ios",
-                           expected_triple="arm64e-apple-ios-",
-                           expected_platform="remote-ios")
-
-    @skipIfRemote
-    @skipUnlessDarwin
-    @skipUnlessArch("arm64")
-    def test_macos(self):
-        self.platform_test(host="macosx",
-                           expected_triple="arm64e-apple-ios-",
-                           expected_platform="host")

diff  --git a/lldb/lldb/unittests/Platform/PlatformMacOSXTest.cpp b/lldb/lldb/unittests/Platform/PlatformMacOSXTest.cpp
deleted file mode 100644
index e35489a47d87e..0000000000000
--- a/lldb/lldb/unittests/Platform/PlatformMacOSXTest.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-//===-- PlatformMacOSXTest.cpp ------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include "gtest/gtest.h"
-
-#include "Plugins/Platform/MacOSX/PlatformMacOSX.h"
-#include "TestingSupport/SubsystemRAII.h"
-#include "lldb/Host/FileSystem.h"
-#include "lldb/Host/HostInfo.h"
-#include "lldb/Target/Platform.h"
-
-using namespace lldb;
-using namespace lldb_private;
-
-class PlatformMacOSXTest : public ::testing::Test {
-  SubsystemRAII<FileSystem, HostInfo, PlatformMacOSX> subsystems;
-};
-
-static bool containsArch(const std::vector<ArchSpec> &archs,
-                         const ArchSpec &arch) {
-  return std::find_if(archs.begin(), archs.end(), [&](const ArchSpec &other) {
-           return arch.IsExactMatch(other);
-         }) != archs.end();
-}
-
-TEST_F(PlatformMacOSXTest, TestGetSupportedArchitectures) {
-  PlatformMacOSX platform;
-
-  const ArchSpec x86_macosx_arch("x86_64-apple-macosx");
-
-  EXPECT_TRUE(containsArch(platform.GetSupportedArchitectures(x86_macosx_arch),
-                           x86_macosx_arch));
-  EXPECT_TRUE(
-      containsArch(platform.GetSupportedArchitectures({}), x86_macosx_arch));
-
-#if defined(__arm__) || defined(__arm64__) || defined(__aarch64__)
-  const ArchSpec arm64_macosx_arch("arm64-apple-macosx");
-  const ArchSpec arm64_ios_arch("arm64-apple-ios");
-
-  EXPECT_TRUE(containsArch(
-      platform.GetSupportedArchitectures(arm64_macosx_arch), arm64_ios_arch));
-  EXPECT_TRUE(
-      containsArch(platform.GetSupportedArchitectures({}), arm64_ios_arch));
-  EXPECT_FALSE(containsArch(platform.GetSupportedArchitectures(arm64_ios_arch),
-                            arm64_ios_arch));
-#endif
-}