[build-script] Add support for passing into swift -DSWIFT_RUNTIME_USE_SANITIZERS flag.

Author: gottesmm

utils/build-script

@@ -1867,8 +1867,11 @@ details of the setups of other systems or automated environments.""")
         action=arguments.action.optional_bool)
     parser.add_argument(
         "--enable-tsan",
-        help="enable Thread Sanitizer",
+        help="enable Thread Sanitizer for swift tools",
         action=arguments.action.optional_bool)
+    parser.add_argument(
+        "--enable-tsan-runtime",
+        help="enable Thread Sanitizer on the swift runtime")
     parser.add_argument(
         "--clang-compiler-version",
         help="string that indicates a compiler version for Clang",

utils/swift_build_support/swift_build_support/products/swift.py

@@ -14,4 +14,19 @@
 
 
 class Swift(product.Product):
-    pass
+
+    def __init__(self, args, toolchain, source_dir, build_dir):
+        product.Product.__init__(self, args, toolchain, source_dir,
+                                 build_dir)
+        # Add any runtime sanitizer arguments.
+        self.cmake_options.extend(self._compute_runtime_use_sanitizer())
+
+
+    def _compute_runtime_use_sanitizer(self):
+        sanitizer_list = []
+        if self.args.enable_tsan_runtime:
+            sanitizer_list += ['Thread']
+        if len(sanitizer_list) == 0:
+            return []
+        return ["-DSWIFT_RUNTIME_USE_SANITIZERS=%s" % \
+            ";".join(sanitizer_list)]

utils/swift_build_support/tests/products/test_swift.py

@@ -0,0 +1,80 @@
+# tests/products/test_swift.py ----------------------------------*- python -*-
+#
+# This source file is part of the Swift.org open source project
+#
+# Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
+# Licensed under Apache License v2.0 with Runtime Library Exception
+#
+# See http://swift.org/LICENSE.txt for license information
+# See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+# ----------------------------------------------------------------------------
+
+import argparse
+import os
+import platform
+import shutil
+import sys
+import tempfile
+import unittest
+try:
+    # py2
+    from StringIO import StringIO
+except ImportError:
+    # py3
+    from io import StringIO
+
+from swift_build_support import shell
+from swift_build_support import xcrun
+from swift_build_support.products import Swift
+from swift_build_support.toolchain import host_toolchain
+from swift_build_support.workspace import Workspace
+
+
+class SwiftTestCase(unittest.TestCase):
+
+    def setUp(self):
+        # Setup workspace
+        tmpdir1 = os.path.realpath(tempfile.mkdtemp())
+        tmpdir2 = os.path.realpath(tempfile.mkdtemp())
+        os.makedirs(os.path.join(tmpdir1, 'swift'))
+
+        self.workspace = Workspace(source_root=tmpdir1,
+                                   build_root=tmpdir2)
+
+        # Setup toolchain
+        self.toolchain = host_toolchain()
+        self.toolchain.cc = '/path/to/cc'
+        self.toolchain.cxx = '/path/to/cxx'
+
+        # Setup args
+        self.args = argparse.Namespace(
+            enable_tsan_runtime=False,
+            darwin_deployment_version_osx="10.9")
+
+        # Setup shell
+        shell.dry_run = True
+        self._orig_stdout = sys.stdout
+        self._orig_stderr = sys.stderr
+        self.stdout = StringIO()
+        self.stderr = StringIO()
+        sys.stdout = self.stdout
+        sys.stderr = self.stderr
+
+    def tearDown(self):
+        shutil.rmtree(self.workspace.build_root)
+        shutil.rmtree(self.workspace.source_root)
+        sys.stdout = self._orig_stdout
+        sys.stderr = self._orig_stderr
+        shell.dry_run = False
+        self.workspace = None
+        self.toolchain = None
+        self.args = None
+
+    def test_swift_runtime_tsan(self):
+        self.args.enable_tsan_runtime = True
+        swift = Swift(
+            args=self.args,
+            toolchain=self.toolchain,
+            source_dir='/path/to/src',
+            build_dir='/path/to/build')
+        self.assertEqual(swift.cmake_options, ['-DSWIFT_RUNTIME_USE_SANITIZERS=Thread'])