Author: Jonas Devlieghere Date: 2019-11-08T18:16:44-08:00 New Revision: 441a78533e61cfffb3fd59e2c169ca7ff7b286dc
URL: https://github.com/llvm/llvm-project/commit/441a78533e61cfffb3fd59e2c169ca7ff7b286dc DIFF: https://github.com/llvm/llvm-project/commit/441a78533e61cfffb3fd59e2c169ca7ff7b286dc.diff LOG: Revert "Add a testcase for .dSYM path remapping dictionaries." This reverts commit 2bbc4fdd8fa0ed58d610ab6260cb664c7cfef204. Added: Modified: Removed: lldb/packages/Python/lldbsuite/test/macosx/DBGSourcePathRemapping/Inputs/main.c lldb/packages/Python/lldbsuite/test/macosx/DBGSourcePathRemapping/Makefile lldb/packages/Python/lldbsuite/test/macosx/DBGSourcePathRemapping/TestDSYMSourcePathRemapping.py ################################################################################ diff --git a/lldb/packages/Python/lldbsuite/test/macosx/DBGSourcePathRemapping/Inputs/main.c b/lldb/packages/Python/lldbsuite/test/macosx/DBGSourcePathRemapping/Inputs/main.c deleted file mode 100644 index 556bda3c17d1..000000000000 --- a/lldb/packages/Python/lldbsuite/test/macosx/DBGSourcePathRemapping/Inputs/main.c +++ /dev/null @@ -1,8 +0,0 @@ -void stop() {} - -int main() -{ - stop(); - // Hello World! - return 0; -} diff --git a/lldb/packages/Python/lldbsuite/test/macosx/DBGSourcePathRemapping/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/DBGSourcePathRemapping/Makefile deleted file mode 100644 index f36a8dc1e671..000000000000 --- a/lldb/packages/Python/lldbsuite/test/macosx/DBGSourcePathRemapping/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -BOTDIR = $(BUILDDIR)/buildbot -USERDIR = $(BUILDDIR)/user -C_SOURCES = $(BOTDIR)/main.c - -include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/macosx/DBGSourcePathRemapping/TestDSYMSourcePathRemapping.py b/lldb/packages/Python/lldbsuite/test/macosx/DBGSourcePathRemapping/TestDSYMSourcePathRemapping.py deleted file mode 100644 index d13a04748672..000000000000 --- a/lldb/packages/Python/lldbsuite/test/macosx/DBGSourcePathRemapping/TestDSYMSourcePathRemapping.py +++ /dev/null @@ -1,56 +0,0 @@ -import lldb -from lldbsuite.test.decorators import * -import lldbsuite.test.lldbtest as lldbtest -import lldbsuite.test.lldbutil as lldbutil -import os -import unittest2 - - -class TestDSYMSourcePathRemapping(lldbtest.TestBase): - - mydir = lldbtest.TestBase.compute_mydir(__file__) - - def build(self): - botdir = self.getBuildArtifact('buildbot') - userdir = self.getBuildArtifact('user') - inputs = self.getSourcePath('Inputs') - lldbutil.mkdir_p(botdir) - lldbutil.mkdir_p(userdir) - import shutil - for f in ['main.c']: - shutil.copyfile(os.path.join(inputs, f), os.path.join(botdir, f)) - shutil.copyfile(os.path.join(inputs, f), os.path.join(userdir, f)) - - super(TestDSYMSourcePathRemapping, self).build() - - # Remove the build sources. - self.assertTrue(os.path.isdir(botdir)) - shutil.rmtree(botdir) - - # Create a plist. - import subprocess - dsym = self.getBuildArtifact('a.out.dSYM') - uuid = subprocess.check_output(["/usr/bin/dwarfdump", "--uuid", dsym] - ).decode("utf-8").split(" ")[1] - import re - self.assertTrue(re.match(r'[0-9a-fA-F-]+', uuid)) - plist = os.path.join(dsym, 'Contents', 'Resources', uuid + '.plist') - with open(plist, 'w') as f: - f.write('<?xml version="1.0" encoding="UTF-8"?>\n') - f.write('<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n') - f.write('<plist version="1.0">\n') - f.write('<dict>\n') - f.write(' <key>DBGSourcePathRemapping</key>\n') - f.write(' <dict>\n') - f.write(' <key>' + botdir + '</key>\n') - f.write(' <string>' + userdir + '</string>\n') - f.write(' </dict>\n') - f.write('</dict>\n') - f.write('</plist>\n') - - - @skipIf(debug_info=no_match("dsym")) - def test(self): - self.build() - lldbutil.run_to_name_breakpoint(self, 'main') - self.expect("source list", substrs=["Hello World"]) _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits