This revision was automatically updated to reflect the committed changes.
Closed by commit rGcf3f100fcbf9: [lldb][test] Prevent infinite loop while
looking for use_lldb_suite_root.py. (authored by rupprecht).
Changed prior to commit:
https://reviews.llvm.org/D83840?vs=278042&id=278219#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D83840/new/
https://reviews.llvm.org/D83840
Files:
lldb/packages/Python/lldbsuite/__init__.py
lldb/scripts/use_lldb_suite.py
lldb/test/API/use_lldb_suite.py
Index: lldb/test/API/use_lldb_suite.py
===================================================================
--- lldb/test/API/use_lldb_suite.py
+++ lldb/test/API/use_lldb_suite.py
@@ -8,21 +8,21 @@
os.path.abspath(inspect.getfile(inspect.currentframe()))
)
while True:
- lldb_root = os.path.dirname(lldb_root)
- if lldb_root is None:
- return None
+ parent = os.path.dirname(lldb_root)
+ if parent == lldb_root: # dirname('/') == '/'
+ raise Exception("use_lldb_suite_root.py not found")
+ lldb_root = parent
test_path = os.path.join(lldb_root, "use_lldb_suite_root.py")
if os.path.isfile(test_path):
return lldb_root
- return None
lldb_root = find_lldb_root()
-if lldb_root is not None:
- import imp
- fp, pathname, desc = imp.find_module("use_lldb_suite_root", [lldb_root])
- try:
- imp.load_module("use_lldb_suite_root", fp, pathname, desc)
- finally:
- if fp:
- fp.close()
+
+import imp
+fp, pathname, desc = imp.find_module("use_lldb_suite_root", [lldb_root])
+try:
+ imp.load_module("use_lldb_suite_root", fp, pathname, desc)
+finally:
+ if fp:
+ fp.close()
Index: lldb/scripts/use_lldb_suite.py
===================================================================
--- lldb/scripts/use_lldb_suite.py
+++ lldb/scripts/use_lldb_suite.py
@@ -8,20 +8,18 @@
while True:
parent = os.path.dirname(lldb_root)
if parent == lldb_root: # dirname('/') == '/'
- break
+ raise Exception("use_lldb_suite_root.py not found")
lldb_root = parent
test_path = os.path.join(lldb_root, "use_lldb_suite_root.py")
if os.path.isfile(test_path):
return lldb_root
- return None
lldb_root = find_lldb_root()
-if lldb_root is not None:
- import imp
- fp, pathname, desc = imp.find_module("use_lldb_suite_root", [lldb_root])
- try:
- imp.load_module("use_lldb_suite_root", fp, pathname, desc)
- finally:
- if fp:
- fp.close()
+import imp
+fp, pathname, desc = imp.find_module("use_lldb_suite_root", [lldb_root])
+try:
+ imp.load_module("use_lldb_suite_root", fp, pathname, desc)
+finally:
+ if fp:
+ fp.close()
Index: lldb/packages/Python/lldbsuite/__init__.py
===================================================================
--- lldb/packages/Python/lldbsuite/__init__.py
+++ lldb/packages/Python/lldbsuite/__init__.py
@@ -8,14 +8,14 @@
def find_lldb_root():
lldb_root = os.path.dirname(inspect.getfile(inspect.currentframe()))
while True:
- lldb_root = os.path.dirname(lldb_root)
- if lldb_root is None:
- return None
+ parent = os.path.dirname(lldb_root)
+ if parent == lldb_root: # dirname('/') == '/'
+ raise Exception("use_lldb_suite_root.py not found")
+ lldb_root = parent
test_path = os.path.join(lldb_root, "use_lldb_suite_root.py")
if os.path.isfile(test_path):
return lldb_root
- return None
# lldbsuite.lldb_root refers to the root of the git/svn source checkout
lldb_root = find_lldb_root()
Index: lldb/test/API/use_lldb_suite.py
===================================================================
--- lldb/test/API/use_lldb_suite.py
+++ lldb/test/API/use_lldb_suite.py
@@ -8,21 +8,21 @@
os.path.abspath(inspect.getfile(inspect.currentframe()))
)
while True:
- lldb_root = os.path.dirname(lldb_root)
- if lldb_root is None:
- return None
+ parent = os.path.dirname(lldb_root)
+ if parent == lldb_root: # dirname('/') == '/'
+ raise Exception("use_lldb_suite_root.py not found")
+ lldb_root = parent
test_path = os.path.join(lldb_root, "use_lldb_suite_root.py")
if os.path.isfile(test_path):
return lldb_root
- return None
lldb_root = find_lldb_root()
-if lldb_root is not None:
- import imp
- fp, pathname, desc = imp.find_module("use_lldb_suite_root", [lldb_root])
- try:
- imp.load_module("use_lldb_suite_root", fp, pathname, desc)
- finally:
- if fp:
- fp.close()
+
+import imp
+fp, pathname, desc = imp.find_module("use_lldb_suite_root", [lldb_root])
+try:
+ imp.load_module("use_lldb_suite_root", fp, pathname, desc)
+finally:
+ if fp:
+ fp.close()
Index: lldb/scripts/use_lldb_suite.py
===================================================================
--- lldb/scripts/use_lldb_suite.py
+++ lldb/scripts/use_lldb_suite.py
@@ -8,20 +8,18 @@
while True:
parent = os.path.dirname(lldb_root)
if parent == lldb_root: # dirname('/') == '/'
- break
+ raise Exception("use_lldb_suite_root.py not found")
lldb_root = parent
test_path = os.path.join(lldb_root, "use_lldb_suite_root.py")
if os.path.isfile(test_path):
return lldb_root
- return None
lldb_root = find_lldb_root()
-if lldb_root is not None:
- import imp
- fp, pathname, desc = imp.find_module("use_lldb_suite_root", [lldb_root])
- try:
- imp.load_module("use_lldb_suite_root", fp, pathname, desc)
- finally:
- if fp:
- fp.close()
+import imp
+fp, pathname, desc = imp.find_module("use_lldb_suite_root", [lldb_root])
+try:
+ imp.load_module("use_lldb_suite_root", fp, pathname, desc)
+finally:
+ if fp:
+ fp.close()
Index: lldb/packages/Python/lldbsuite/__init__.py
===================================================================
--- lldb/packages/Python/lldbsuite/__init__.py
+++ lldb/packages/Python/lldbsuite/__init__.py
@@ -8,14 +8,14 @@
def find_lldb_root():
lldb_root = os.path.dirname(inspect.getfile(inspect.currentframe()))
while True:
- lldb_root = os.path.dirname(lldb_root)
- if lldb_root is None:
- return None
+ parent = os.path.dirname(lldb_root)
+ if parent == lldb_root: # dirname('/') == '/'
+ raise Exception("use_lldb_suite_root.py not found")
+ lldb_root = parent
test_path = os.path.join(lldb_root, "use_lldb_suite_root.py")
if os.path.isfile(test_path):
return lldb_root
- return None
# lldbsuite.lldb_root refers to the root of the git/svn source checkout
lldb_root = find_lldb_root()
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
