From b9c1b51e45b845debb76d8658edabca70ca56079 Mon Sep 17 00:00:00 2001 From: Kate Stone Date: Tue, 6 Sep 2016 20:57:50 +0000 Subject: =?UTF-8?q?***=20This=20commit=20represents=20a=20complete=20refor?= =?UTF-8?q?matting=20of=20the=20LLDB=20source=20code=20***=20to=20conform?= =?UTF-8?q?=20to=20clang-format=E2=80=99s=20LLVM=20style.=20=20This=20kind?= =?UTF-8?q?=20of=20mass=20change=20has=20***=20two=20obvious=20implication?= =?UTF-8?q?s:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Firstly, merging this particular commit into a downstream fork may be a huge effort. Alternatively, it may be worth merging all changes up to this commit, performing the same reformatting operation locally, and then discarding the merge for this particular commit. The commands used to accomplish this reformatting were as follows (with current working directory as the root of the repository): find . \( -iname "*.c" -or -iname "*.cpp" -or -iname "*.h" -or -iname "*.mm" \) -exec clang-format -i {} + find . -iname "*.py" -exec autopep8 --in-place --aggressive --aggressive {} + ; The version of clang-format used was 3.9.0, and autopep8 was 1.2.4. Secondly, “blame” style tools will generally point to this commit instead of a meaningful prior commit. There are alternatives available that will attempt to look through this change and find the appropriate prior commit. YMMV. llvm-svn: 280751 --- lldb/scripts/buildbot.py | 122 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 83 insertions(+), 39 deletions(-) (limited to 'lldb/scripts/buildbot.py') diff --git a/lldb/scripts/buildbot.py b/lldb/scripts/buildbot.py index 0c04d9c..29c383c 100755 --- a/lldb/scripts/buildbot.py +++ b/lldb/scripts/buildbot.py @@ -7,7 +7,9 @@ import shutil import subprocess import sys + class BuildError(Exception): + def __init__(self, string=None, path=None, @@ -15,23 +17,28 @@ class BuildError(Exception): self.m_string = string self.m_path = path self.m_inferior_error = inferior_error + def __str__(self): if self.m_path and self.m_string: - return "Build error: %s (referring to %s)" % (self.m_string, self.m_path) + return "Build error: %s (referring to %s)" % ( + self.m_string, self.m_path) if self.m_path: return "Build error (referring to %s)" % (self.m_path) if self.m_string: return "Build error: %s" % (self.m_string) return "Build error" + class LLDBBuildBot: - def __init__(self, - build_directory_path, - log_path, - lldb_repository_url="http://llvm.org/svn/llvm-project/lldb/trunk", - llvm_repository_url="http://llvm.org/svn/llvm-project/llvm/trunk", - clang_repository_url="http://llvm.org/svn/llvm-project/cfe/trunk", - revision=None): + + def __init__( + self, + build_directory_path, + log_path, + lldb_repository_url="http://llvm.org/svn/llvm-project/lldb/trunk", + llvm_repository_url="http://llvm.org/svn/llvm-project/llvm/trunk", + clang_repository_url="http://llvm.org/svn/llvm-project/cfe/trunk", + revision=None): self.m_build_directory_path = os.path.abspath(build_directory_path) self.m_log_path = os.path.abspath(log_path) self.m_lldb_repository_url = lldb_repository_url @@ -39,34 +46,44 @@ class LLDBBuildBot: self.m_clang_repository_url = clang_repository_url self.m_revision = revision self.m_log_stream = None + def Setup(self): if os.path.exists(self.m_build_directory_path): - raise BuildError(string="Build directory exists", path=self.m_build_directory_path) + raise BuildError( + string="Build directory exists", + path=self.m_build_directory_path) if os.path.exists(self.m_log_path): raise BuildError(string="Log file exists", path=self.m_log_path) self.m_log_stream = open(self.m_log_path, 'w') os.mkdir(self.m_build_directory_path) + def Checkout(self): os.chdir(self.m_build_directory_path) - + cmdline_prefix = [] - - if self.m_revision != None: + + if self.m_revision is not None: cmdline_prefix = ["svn", "-r %s" % (self.m_revision), "co"] else: cmdline_prefix = ["svn", "co"] - returncode = subprocess.call(cmdline_prefix + [self.m_lldb_repository_url, "lldb"], - stdout=self.m_log_stream, - stderr=self.m_log_stream) + returncode = subprocess.call( + cmdline_prefix + [ + self.m_lldb_repository_url, + "lldb"], + stdout=self.m_log_stream, + stderr=self.m_log_stream) if returncode != 0: raise BuildError(string="Couldn't checkout LLDB") os.chdir("lldb") - returncode = subprocess.call(cmdline_prefix + [self.m_llvm_repository_url, "llvm.checkout"], - stdout=self.m_log_stream, - stderr=self.m_log_stream) + returncode = subprocess.call( + cmdline_prefix + [ + self.m_llvm_repository_url, + "llvm.checkout"], + stdout=self.m_log_stream, + stderr=self.m_log_stream) if returncode != 0: raise BuildError(string="Couldn't checkout LLVM") @@ -75,25 +92,32 @@ class LLDBBuildBot: os.chdir("llvm/tools") - returncode = subprocess.call(cmdline_prefix + [self.m_clang_repository_url, "clang"], - stdout=self.m_log_stream, - stderr=self.m_log_stream) + returncode = subprocess.call( + cmdline_prefix + [ + self.m_clang_repository_url, + "clang"], + stdout=self.m_log_stream, + stderr=self.m_log_stream) if returncode != 0: raise BuildError(string="Couldn't checkout Clang") + def Build(self): os.chdir(self.m_build_directory_path) os.chdir("lldb/llvm") - returncode = subprocess.call(["./configure", "--disable-optimized", "--enable-assertions", "--enable-targets=x86,x86_64,arm"], - stdout=self.m_log_stream, + returncode = subprocess.call(["./configure", + "--disable-optimized", + "--enable-assertions", + "--enable-targets=x86,x86_64,arm"], + stdout=self.m_log_stream, stderr=self.m_log_stream) if returncode != 0: raise BuildError(string="Couldn't configure LLVM/Clang") - returncode = subprocess.call(["make"], - stdout=self.m_log_stream, + returncode = subprocess.call(["make"], + stdout=self.m_log_stream, stderr=self.m_log_stream) if returncode != 0: @@ -102,41 +126,61 @@ class LLDBBuildBot: os.chdir(self.m_build_directory_path) os.chdir("lldb") - returncode = subprocess.call(["xcodebuild", - "-project", "lldb.xcodeproj", - "-target", "lldb-tool", - "-configuration", "Debug", + returncode = subprocess.call(["xcodebuild", + "-project", "lldb.xcodeproj", + "-target", "lldb-tool", + "-configuration", "Debug", "-arch", "x86_64", "LLVM_CONFIGURATION=Debug+Asserts", "OBJROOT=build"], - stdout=self.m_log_stream, - stderr=self.m_log_stream) + stdout=self.m_log_stream, + stderr=self.m_log_stream) if returncode != 0: raise BuildError(string="Couldn't build LLDB") + def Test(self): os.chdir(self.m_build_directory_path) os.chdir("lldb/test") - - returncode = subprocess.call(["./dotest.py", "-t"], - stdout=self.m_log_stream, + + returncode = subprocess.call(["./dotest.py", "-t"], + stdout=self.m_log_stream, stderr=self.m_log_stream) + def Takedown(self): os.chdir("/tmp") self.m_log_stream.close() shutil.rmtree(self.m_build_directory_path) + def Run(self): self.Setup() self.Checkout() self.Build() - #self.Test() + # self.Test() self.Takedown() + def GetArgParser(): - parser = argparse.ArgumentParser(description="Try to build LLDB/LLVM/Clang and run the full test suite.") - parser.add_argument("--build-path", "-b", required=True, help="A (nonexistent) path to put temporary build products into", metavar="path") - parser.add_argument("--log-file", "-l", required=True, help="The name of a (nonexistent) log file", metavar="file") - parser.add_argument("--revision", "-r", required=False, help="The LLVM revision to use", metavar="N") + parser = argparse.ArgumentParser( + description="Try to build LLDB/LLVM/Clang and run the full test suite.") + parser.add_argument( + "--build-path", + "-b", + required=True, + help="A (nonexistent) path to put temporary build products into", + metavar="path") + parser.add_argument( + "--log-file", + "-l", + required=True, + help="The name of a (nonexistent) log file", + metavar="file") + parser.add_argument( + "--revision", + "-r", + required=False, + help="The LLVM revision to use", + metavar="N") return parser parser = GetArgParser() -- cgit v1.1