Skip to content

Commit

Permalink
Fix macOS buildbots after https://reviews.llvm.org/D115324.
Browse files Browse the repository at this point in the history
The test was attempting to make a universal x86_64/arm64 binary, but some older bots don't have a macOS SDK that can handle this. Switching over to using a yaml file instead should solve the problem.
  • Loading branch information
clayborg committed Dec 17, 2021
1 parent 46ad66b commit 2a844c8
Show file tree
Hide file tree
Showing 4 changed files with 528 additions and 26 deletions.
20 changes: 0 additions & 20 deletions lldb/test/API/functionalities/module_cache/universal/Makefile

This file was deleted.

Expand Up @@ -22,8 +22,6 @@ def setUp(self):
# artifacts directory so no other tests are interfered with.
self.runCmd('settings set symbols.lldb-index-cache-path "%s"' % (self.cache_dir))
self.runCmd('settings set symbols.enable-lldb-index-cache true')
self.build()


def get_module_cache_files(self, basename):
module_file_glob = os.path.join(self.cache_dir, "llvmcache-*%s*" % (basename))
Expand All @@ -43,8 +41,12 @@ def test(self):
they will each have a unique directory.
"""
exe_basename = "testit"
src_dir = self.getSourceDir()
yaml_path = os.path.join(src_dir, "universal.yaml")
yaml_base, ext = os.path.splitext(yaml_path)
exe = self.getBuildArtifact(exe_basename)

self.yaml2obj(yaml_path, exe)
self.assertTrue(os.path.exists(exe))
# Create a module with no depedencies.
self.runCmd('target create -d --arch x86_64 %s' % (exe))
self.runCmd('image dump symtab %s' % (exe_basename))
Expand Down
3 changes: 0 additions & 3 deletions lldb/test/API/functionalities/module_cache/universal/main.c

This file was deleted.

0 comments on commit 2a844c8

Please sign in to comment.