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 --- .../Python/lldbsuite/test/configuration.py | 31 ++++++++++++++-------- 1 file changed, 20 insertions(+), 11 deletions(-) (limited to 'lldb/packages/Python/lldbsuite/test/configuration.py') diff --git a/lldb/packages/Python/lldbsuite/test/configuration.py b/lldb/packages/Python/lldbsuite/test/configuration.py index d797b17..ff06178 100644 --- a/lldb/packages/Python/lldbsuite/test/configuration.py +++ b/lldb/packages/Python/lldbsuite/test/configuration.py @@ -23,26 +23,31 @@ import unittest2 # LLDB Modules import lldbsuite + def __setCrashInfoHook_Mac(text): from . import crashinfo crashinfo.setCrashReporterDescription(text) + def setupCrashInfoHook(): if platform.system() == "Darwin": from . import lock test_dir = os.environ['LLDB_TEST'] if not test_dir or not os.path.exists(test_dir): return - dylib_lock = os.path.join(test_dir,"crashinfo.lock") - dylib_src = os.path.join(test_dir,"crashinfo.c") - dylib_dst = os.path.join(test_dir,"crashinfo.so") + dylib_lock = os.path.join(test_dir, "crashinfo.lock") + dylib_src = os.path.join(test_dir, "crashinfo.c") + dylib_dst = os.path.join(test_dir, "crashinfo.so") try: compile_lock = lock.Lock(dylib_lock) compile_lock.acquire() - if not os.path.isfile(dylib_dst) or os.path.getmtime(dylib_dst) < os.path.getmtime(dylib_src): + if not os.path.isfile(dylib_dst) or os.path.getmtime( + dylib_dst) < os.path.getmtime(dylib_src): # we need to compile - cmd = "SDKROOT= xcrun clang %s -o %s -framework Python -Xlinker -dylib -iframework /System/Library/Frameworks/ -Xlinker -F /System/Library/Frameworks/" % (dylib_src,dylib_dst) - if subprocess.call(cmd,shell=True) != 0 or not os.path.isfile(dylib_dst): + cmd = "SDKROOT= xcrun clang %s -o %s -framework Python -Xlinker -dylib -iframework /System/Library/Frameworks/ -Xlinker -F /System/Library/Frameworks/" % ( + dylib_src, dylib_dst) + if subprocess.call( + cmd, shell=True) != 0 or not os.path.isfile(dylib_dst): raise Exception('command failed: "{}"'.format(cmd)) finally: compile_lock.release() @@ -92,7 +97,8 @@ skip_long_running_test = True # prints machine-readable output similar to what clang tests produce. parsable = False -# The regular expression pattern to match against eligible filenames as our test cases. +# The regular expression pattern to match against eligible filenames as +# our test cases. regexp = None # By default, recorded session info for errored/failed test are dumped into its @@ -121,7 +127,7 @@ verbose = 0 # By default, search from the script directory. # We can't use sys.path[0] to determine the script directory # because it doesn't work under a debugger -testdirs = [ os.path.dirname(os.path.realpath(__file__)) ] +testdirs = [os.path.dirname(os.path.realpath(__file__))] # Separator string. separator = '-' * 70 @@ -152,15 +158,18 @@ test_result = None rerun_all_issues = False rerun_max_file_threhold = 0 -# The names of all tests. Used to assert we don't have two tests with the same base name. +# The names of all tests. Used to assert we don't have two tests with the +# same base name. all_tests = set() # safe default -setCrashInfoHook = lambda x : None +setCrashInfoHook = lambda x: None + def shouldSkipBecauseOfCategories(test_categories): if useCategories: - if len(test_categories) == 0 or len(categoriesList & set(test_categories)) == 0: + if len(test_categories) == 0 or len( + categoriesList & set(test_categories)) == 0: return True for category in skipCategories: -- cgit v1.1