Revert "[lldb] Explicitly use the configuration architecture when building test execu...

This reverts commit 41185226f6d80663b4a1064c6f47581ee567d78d.

Causes TestQuoting to fail on Windows.

diff --git a/lldb/packages/Python/lldbsuite/test/builders/builder.py b/lldb/packages/Python/lldbsuite/test/builders/builder.py
index 6c95842..fbfa867 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/builders/builder.py
+++ b/lldb/packages/Python/lldbsuite/test/builders/builder.py
@@ -93,7 +93,11 @@ class Builder:
         Helper function to return the key-value string to specify the architecture
         used for the make system.
         """
-        return ("ARCH=" + architecture) if architecture else ""
+        arch = architecture if architecture else None
+        if not arch and configuration.arch:
+            arch = configuration.arch
+
+        return ("ARCH=" + arch) if arch else ""
 
     def getCCSpec(self, compiler):
         """

diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py
index f469ce8..69da391 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lldbtest.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py
@@ -2606,9 +2606,6 @@ FileCheck output:
         """Platform specific way to build the default binaries."""
         module = builder_module()
 
-        if not architecture and configuration.arch:
-            architecture = configuration.arch
-
         dictionary = lldbplatformutil.finalize_build_dictionary(dictionary)
         if self.getDebugInfo() is None:
             return self.buildDefault(architecture, compiler, dictionary)