Author: Raphael Isemann Date: 2020-11-05T16:32:05+01:00 New Revision: b9b5f12bd4cd0647ff630c1631e0cf20f430fa15
URL: https://github.com/llvm/llvm-project/commit/b9b5f12bd4cd0647ff630c1631e0cf20f430fa15 DIFF: https://github.com/llvm/llvm-project/commit/b9b5f12bd4cd0647ff630c1631e0cf20f430fa15.diff LOG: [lldb] Set the default architecture also in buildDefault In D89056 the default value for architecture was moved to `build` so that all called functions see the same architecture value. It seems there are a few functions that call buildDefault directly (and not via build), so on some test configurations that set a custom arch value the architecture value is no longer available. This just adds the architecture code from build to buildDefault to get the bots green again while I'm looking for a better solution. Added: Modified: lldb/packages/Python/lldbsuite/test/lldbtest.py Removed: ################################################################################ diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py index 73007caf2108..08f44c731383 100644 --- a/lldb/packages/Python/lldbsuite/test/lldbtest.py +++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py @@ -1591,6 +1591,10 @@ def buildDefault( """Platform specific way to build the default binaries.""" testdir = self.mydir testname = self.getBuildDirBasename() + + if not architecture and configuration.arch: + architecture = configuration.arch + if self.getDebugInfo(): raise Exception("buildDefault tests must set NO_DEBUG_INFO_TESTCASE") module = builder_module() _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
