[Lldb-commits] [lldb] 039b28e - [LLDB] Fix TestDataFormatterSynthVal.py for AArch64/Windows

[Muhammad Omair Javaid via lldb-commits]

Author: Muhammad Omair Javaid
Date: 2023-05-16T00:14:20+04:00
New Revision: 039b28e14e6d5a4b9b9b333695dabe9dc57233b0

URL: https://github.com/llvm/llvm-project/commit/039b28e14e6d5a4b9b9b333695dabe9dc57233b0
DIFF: https://github.com/llvm/llvm-project/commit/039b28e14e6d5a4b9b9b333695dabe9dc57233b0.diff

LOG: [LLDB] Fix TestDataFormatterSynthVal.py for AArch64/Windows

Since 44363f2 various tests have started passing but introduced a
expression evaluation failure in TestDataFormatterSynthVal.py.
This patch marks the expression evaluation part as skipped while rest
of the test passes.
This patch aslo introduces a new helper isAArch64Windows in lldbtest.py.

Added: 
    

Modified: 
    lldb/packages/Python/lldbsuite/test/lldbtest.py
    lldb/test/API/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py

Removed: 
    


################################################################################
diff  --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py
index 31539f6a768bd..0ca0fac7bb3f6 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbtest.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py
@@ -1252,6 +1252,13 @@ def isAArch64PAuth(self):
             return True
         return self.isAArch64() and "paca" in self.getCPUInfo()
 
+    def isAArch64Windows(self):
+        """Returns true if the architecture is AArch64 and platform windows."""
+        if self.getPlatform() == 'windows':
+            arch = self.getArchitecture().lower()
+            return arch in ["aarch64", "arm64", "arm64e"]
+        return False
+
     def getArchitecture(self):
         """Returns the architecture in effect the test suite is running with."""
         module = builder_module()

diff  --git a/lldb/test/API/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py b/lldb/test/API/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py
index 2e1367563cd7b..67619287ef65e 100644
--- a/lldb/test/API/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py
+++ b/lldb/test/API/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py
@@ -96,9 +96,10 @@ def cleanup():
 
         # check that an aptly defined synthetic provider does not affect
         # one-lining
-        self.expect(
-            "expression struct Struct { myInt theInt{12}; }; Struct()",
-            substrs=['(theInt = 12)'])
+        if self.isAArch64Windows():
+            self.expect(
+                "expression struct Struct { myInt theInt{12}; }; Struct()",
+                substrs=['(theInt = 12)'])
 
         # check that we can use a synthetic value in a summary
         self.runCmd("type summary add hasAnInt -s ${var.theInt}")