*** This commit represents a complete reformatting of the LLDB source code

*** to conform to clang-format’s LLVM style.  This kind of mass change has
*** two obvious implications:

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

1 files changed, 40 insertions, 21 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/basic/TestTsanBasic.py b/lldb/packages/Python/lldbsuite/test/functionalities/tsan/basic/TestTsanBasic.py
index 44fa9cedc86..241c49897ef 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/tsan/basic/TestTsanBasic.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tsan/basic/TestTsanBasic.py
@@ -2,25 +2,29 @@
 Tests basic ThreadSanitizer support (detecting a data race).
 """
 
-import os, time
+import os
+import time
 import lldb
 from lldbsuite.test.lldbtest import *
 from lldbsuite.test.decorators import *
 import lldbsuite.test.lldbutil as lldbutil
 import json
 
+
 class TsanBasicTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @expectedFailureAll(oslist=["linux"], bugnumber="non-core functionality, need to reenable and fix later (DES 2014.11.07)")
-    @skipIfFreeBSD # llvm.org/pr21136 runtimes not yet available by default
+    @expectedFailureAll(
+        oslist=["linux"],
+        bugnumber="non-core functionality, need to reenable and fix later (DES 2014.11.07)")
+    @skipIfFreeBSD  # llvm.org/pr21136 runtimes not yet available by default
     @skipIfRemote
     @skipUnlessCompilerRt
     @skipUnlessThreadSanitizer
-    def test (self):
-        self.build ()
-        self.tsan_tests ()
+    def test(self):
+        self.build()
+        self.tsan_tests()
 
     def setUp(self):
         # Call super's setUp().
@@ -29,26 +33,33 @@ class TsanBasicTestCase(TestBase):
         self.line_thread1 = line_number('main.c', '// thread1 line')
         self.line_thread2 = line_number('main.c', '// thread2 line')
 
-    def tsan_tests (self):
-        exe = os.path.join (os.getcwd(), "a.out")
-        self.expect("file " + exe, patterns = [ "Current executable set to .*a.out" ])
+    def tsan_tests(self):
+        exe = os.path.join(os.getcwd(), "a.out")
+        self.expect(
+            "file " + exe,
+            patterns=["Current executable set to .*a.out"])
 
         self.runCmd("run")
 
         stop_reason = self.dbg.GetSelectedTarget().process.GetSelectedThread().GetStopReason()
         if stop_reason == lldb.eStopReasonExec:
-            # On OS X 10.10 and older, we need to re-exec to enable interceptors.
+            # On OS X 10.10 and older, we need to re-exec to enable
+            # interceptors.
             self.runCmd("continue")
 
         # the stop reason of the thread should be breakpoint.
         self.expect("thread list", "A data race should be detected",
-            substrs = ['stopped', 'stop reason = Data race detected'])
+                    substrs=['stopped', 'stop reason = Data race detected'])
 
-        self.assertEqual(self.dbg.GetSelectedTarget().process.GetSelectedThread().GetStopReason(), lldb.eStopReasonInstrumentation)
+        self.assertEqual(
+            self.dbg.GetSelectedTarget().process.GetSelectedThread().GetStopReason(),
+            lldb.eStopReasonInstrumentation)
 
         # test that the TSan dylib is present
-        self.expect("image lookup -n __tsan_get_current_report", "__tsan_get_current_report should be present",
-            substrs = ['1 match found'])
+        self.expect(
+            "image lookup -n __tsan_get_current_report",
+            "__tsan_get_current_report should be present",
+            substrs=['1 match found'])
 
         # We should be stopped in __tsan_on_report
         process = self.dbg.GetSelectedTarget().process
@@ -56,7 +67,8 @@ class TsanBasicTestCase(TestBase):
         frame = thread.GetSelectedFrame()
         self.assertTrue("__tsan_on_report" in frame.GetFunctionName())
 
-        # The stopped thread backtrace should contain either line1 or line2 from main.c.
+        # The stopped thread backtrace should contain either line1 or line2
+        # from main.c.
         found = False
         for i in range(0, thread.GetNumFrames()):
             frame = thread.GetFrameAtIndex(i)
@@ -67,8 +79,13 @@ class TsanBasicTestCase(TestBase):
                     found = True
         self.assertTrue(found)
 
-        self.expect("thread info -s", "The extended stop info should contain the TSan provided fields",
-            substrs = ["instrumentation_class", "description", "mops"])
+        self.expect(
+            "thread info -s",
+            "The extended stop info should contain the TSan provided fields",
+            substrs=[
+                "instrumentation_class",
+                "description",
+                "mops"])
 
         output_lines = self.res.GetOutput().split('\n')
         json_line = '\n'.join(output_lines[2:])
@@ -77,10 +94,12 @@ class TsanBasicTestCase(TestBase):
         self.assertEqual(data["issue_type"], "data-race")
         self.assertEqual(len(data["mops"]), 2)
 
-        backtraces = thread.GetStopReasonExtendedBacktraces(lldb.eInstrumentationRuntimeTypeAddressSanitizer)
+        backtraces = thread.GetStopReasonExtendedBacktraces(
+            lldb.eInstrumentationRuntimeTypeAddressSanitizer)
         self.assertEqual(backtraces.GetSize(), 0)
 
-        backtraces = thread.GetStopReasonExtendedBacktraces(lldb.eInstrumentationRuntimeTypeThreadSanitizer)
+        backtraces = thread.GetStopReasonExtendedBacktraces(
+            lldb.eInstrumentationRuntimeTypeThreadSanitizer)
         self.assertTrue(backtraces.GetSize() >= 2)
 
         # First backtrace is a memory operation
@@ -111,8 +130,8 @@ class TsanBasicTestCase(TestBase):
 
         # the stop reason of the thread should be a SIGABRT.
         self.expect("thread list", "We should be stopped due a SIGABRT",
-            substrs = ['stopped', 'stop reason = signal SIGABRT'])
+                    substrs=['stopped', 'stop reason = signal SIGABRT'])
 
         # test that we're in pthread_kill now (TSan abort the process)
         self.expect("thread list", "We should be stopped in pthread_kill",
-            substrs = ['pthread_kill'])
+                    substrs=['pthread_kill'])