Merge branch 'master' into add-kickstarter-oss

# Conflicts:
#	projects.json

Author: justinswart

.github/PULL_REQUEST_TEMPLATE.md

@@ -11,8 +11,7 @@ To be accepted into the Swift source compatibility test suite, a project must:
 - [ ] support building on either Linux or macOS
 - [ ] target Linux, macOS, or iOS/tvOS/watchOS device
 - [ ] be contained in a publicly accessible git repository
-- [ ] maintain a project branch that builds against Swift 3.0 compatibility mode
-      or Swift 4.0 and passes any unit tests
+- [ ] maintain a project branch that builds against Swift 4.0 and passes any unit tests
 - [ ] have maintainers who will commit to resolve issues in a timely manner
 - [ ] be compatible with the latest GM/Beta versions of *Xcode* and *swiftpm*
 - [ ] add value not already included in the suite

.gitignore

@@ -14,3 +14,4 @@ swift-corelibs-foundation/
 swift-corelibs-libdispatch/
 swift-corelibs-xctest/
 swiftpm/
+swift-stress-tester/

cleanup

@@ -52,6 +52,7 @@ def main():
         'swift-corelibs-foundation',
         'swift-corelibs-libdispatch',
         'swift-corelibs-xctest',
+        'swift-stress-tester'
     ]
 
     if args.cleanup_cache:

common.py

@@ -52,7 +52,7 @@
         'cmark': 'master',
         'ninja': 'release',
         'llbuild': 'master',
-        'swiftpm': 'master',
+        'swiftpm': 'swift-4.2-branch',
         'swift-corelibs-libdispatch': 'swift-4.2-branch',
         'swift-corelibs-foundation': 'swift-4.2-branch',
         'swift-corelibs-xctest': 'swift-4.2-branch',
@@ -143,6 +143,12 @@ def set_swift_branch(branch):
     swift_branch = branch
 
 
+def set_default_execute_timeout(timeout):
+    """Override the default execute timeout"""
+    global DEFAULT_EXECUTE_TIMEOUT
+    DEFAULT_EXECUTE_TIMEOUT = timeout
+
+
 def clone_repos():
     """Clone Swift and dependencies in parallel.
 
@@ -299,14 +305,16 @@ def __str__(self):
                     self.returncode))
 
 
-def execute(command, timeout=DEFAULT_EXECUTE_TIMEOUT,
+def execute(command, timeout=None,
             stdout=sys.stdout, stderr=sys.stderr,
             **kwargs):
     """Execute a given command with an optional timeout in seconds.
 
     >>> execute(['echo', 'Hello, World!'])
     0
     """
+    if timeout is None:
+        timeout = DEFAULT_EXECUTE_TIMEOUT
     shell_debug_print(command, stderr=stderr)
     returncode = 124  # timeout return code
     try:
@@ -320,13 +328,15 @@ def execute(command, timeout=DEFAULT_EXECUTE_TIMEOUT,
     return returncode
 
 
-def check_execute_output(command, timeout=DEFAULT_EXECUTE_TIMEOUT,
+def check_execute_output(command, timeout=None,
                          stdout=sys.stdout, stderr=sys.stderr, **kwargs):
     """Check execute a given command and return its output.
 
     >>> check_execute_output(['echo', 'Hello, World!'])
     'Hello, World!\\n'
     """
+    if timeout is None:
+        timeout = DEFAULT_EXECUTE_TIMEOUT
     shell_debug_print(command, stderr=stderr)
     try:
         with Timeout(timeout):
@@ -339,7 +349,7 @@ def check_execute_output(command, timeout=DEFAULT_EXECUTE_TIMEOUT,
     return output
 
 
-def check_execute(command, timeout=DEFAULT_EXECUTE_TIMEOUT,
+def check_execute(command, timeout=None,
                   sandbox_profile=None, max_retries=1,
                   stdout=sys.stdout, stderr=sys.stderr,
                   **kwargs):
@@ -348,6 +358,8 @@ def check_execute(command, timeout=DEFAULT_EXECUTE_TIMEOUT,
     >>> check_execute(['echo', 'Hello, World!'])
     0
     """
+    if timeout is None:
+        timeout = DEFAULT_EXECUTE_TIMEOUT
     if sandbox_profile:
         if platform.system() == 'Darwin':
             command = ['sandbox-exec', '-f', sandbox_profile] + command

project.py

@@ -124,6 +124,8 @@ def get_build_command(self, incremental=False):
                 command += ['-configuration', value]
             else:
                 command += ['%s=%s' % (setting, value)]
+        if self._destination == 'generic/platform=watchOS':
+            command += ['ARCHS=armv7k']
 
         return command
 
@@ -196,6 +198,7 @@ def build_swift_package(path, swiftc, configuration, sandbox_profile,
                             stdout=stdout, stderr=stderr)
     env = os.environ
     env['SWIFT_EXEC'] = swiftc
+    env['SWIFT_SOURCE_COMPAT_SUITE'] = "1"
     command = [swift, 'build', '-C', path, '--verbose',
                '--configuration', configuration]
     if (swift_branch not in ['swift-3.0-branch',
@@ -220,6 +223,7 @@ def test_swift_package(path, swiftc, sandbox_profile,
         clean_swift_package(path, swiftc, sandbox_profile)
     env = os.environ
     env['SWIFT_EXEC'] = swiftc
+    env['SWIFT_SOURCE_COMPAT_SUITE'] = "1"
     command = [swift, 'test', '-C', path, '--verbose']
     if added_swift_flags is not None:
         for flag in added_swift_flags.split():

project_future.py

@@ -118,12 +118,14 @@ def get_build_command(self, incremental=False):
                    + ['CODE_SIGN_IDENTITY=',
                       'CODE_SIGNING_REQUIRED=NO',
                       'ENABLE_BITCODE=NO',
-                      '-UseNewBuildSystem=NO',
                       'INDEX_ENABLE_DATA_STORE=NO',
                       'GCC_TREAT_WARNINGS_AS_ERRORS=NO',
                       'SWIFT_TREAT_WARNINGS_AS_ERRORS=NO'])
         command += self._added_xcodebuild_flags
 
+        if self._destination == 'generic/platform=watchOS':
+            command += ['ARCHS=armv7k']
+
         return command
 
     def get_test_command(self, incremental=False):

project_precommit_check

@@ -68,9 +68,9 @@ supported_configs = {
         },
         '4.2': {
             'version': 'Apple Swift version 4.2 '
-                       '(swiftlang-1000.0.25.1 clang-1000.10.28.1)\n'
+                       '(swiftlang-1000.11.37.1 clang-1000.11.45.1)\n'
                        'Target: x86_64-apple-darwin17.7.0\n',
-            'description': 'Xcode 10 Beta 3 (contains Swift 4.2)',
+            'description': 'Xcode 10.0 (contains Swift 4.2)',
             'branch': 'swift-4.2-branch'
         }
     },