Skip to content

Commit

Permalink
[lldb] Set the default architecture also in buildDefault
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Teemperor committed Nov 5, 2020
1 parent 6b104ea commit b9b5f12
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions lldb/packages/Python/lldbsuite/test/lldbtest.py
Expand Up @@ -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()
Expand Down

0 comments on commit b9b5f12

Please sign in to comment.