[lldb] Improve CPUInfo test predicate
Use a with block for reading the cpuinfo file.
When loading the file fails (or we're not on Linux)
return an empty string. Since all the callers are
going to do "x in self.getCPUInfo()".
Reviewed By: omjavaid
Differential Revision: https://reviews.llvm.org/D99729
GitOrigin-RevId: f8f4d8f87ba4c1fbb18a4e7f4a5ea03a8b8ec061
diff --git a/packages/Python/lldbsuite/test/lldbtest.py b/packages/Python/lldbsuite/test/lldbtest.py
index a9928af..d94f8e9 100644
--- a/packages/Python/lldbsuite/test/lldbtest.py
+++ b/packages/Python/lldbsuite/test/lldbtest.py
@@ -1274,7 +1274,7 @@
# TODO other platforms, please implement this function
if not re.match(".*-.*-linux", triple):
- return False
+ return ""
# Need to do something different for non-Linux/Android targets
cpuinfo_path = self.getBuildArtifact("cpuinfo")
@@ -1284,11 +1284,10 @@
cpuinfo_path = "/proc/cpuinfo"
try:
- f = open(cpuinfo_path, 'r')
- cpuinfo = f.read()
- f.close()
+ with open(cpuinfo_path, 'r') as f:
+ cpuinfo = f.read()
except:
- return False
+ return ""
return cpuinfo
