Remove lldb.root and just look for the file we care about.

Zachary Turner · Zachary Turner · commit 4c152690be69 · 2015-11-20T17:40:57.000Z
llvm-svn: 253679
diff --git a/lldb/lldb.root b/lldb/lldb.root
diff --git a/lldb/packages/Python/lldbsuite/__init__.py b/lldb/packages/Python/lldbsuite/__init__.py
@@ -11,7 +11,7 @@ def find_lldb_root():
         if lldb_root is None:
             return None
 
-        test_path = os.path.join(lldb_root, "lldb.root")
+        test_path = os.path.join(lldb_root, "use_lldb_suite_root.py")
         if os.path.isfile(test_path):
             return lldb_root
     return None
diff --git a/lldb/scripts/Python/use_lldb_suite.py b/lldb/scripts/Python/use_lldb_suite.py
@@ -9,7 +9,7 @@ def find_lldb_root():
         if lldb_root is None:
             return None
 
-        test_path = os.path.join(lldb_root, "lldb.root")
+        test_path = os.path.join(lldb_root, "use_lldb_suite_root.py")
         if os.path.isfile(test_path):
             return lldb_root
     return None
diff --git a/lldb/scripts/use_lldb_suite.py b/lldb/scripts/use_lldb_suite.py
@@ -9,7 +9,7 @@ def find_lldb_root():
         if lldb_root is None:
             return None
 
-        test_path = os.path.join(lldb_root, "lldb.root")
+        test_path = os.path.join(lldb_root, "use_lldb_suite_root.py")
         if os.path.isfile(test_path):
             return lldb_root
     return None
diff --git a/lldb/test/use_lldb_suite.py b/lldb/test/use_lldb_suite.py
@@ -9,7 +9,7 @@ def find_lldb_root():
         if lldb_root is None:
             return None
 
-        test_path = os.path.join(lldb_root, "lldb.root")
+        test_path = os.path.join(lldb_root, "use_lldb_suite_root.py")
         if os.path.isfile(test_path):
             return lldb_root
     return None
