Merge pull request #65 from apple/master-rebranch

Update master to support new stable branch for LLVM Projects

Author: shahmishal

test-snapshot-binaries/test-rpath-linux-repl.py

@@ -1,4 +1,4 @@
 # Tests that DT_RPATH is correct for the dummy repl executable on Linux.
 # REQUIRES: platform=Linux
 # RUN: %{readelf} -d %{repl_swift} | %{FileCheck} %s
-# CHECK: {{.*}} {{RPATH|RUNPATH}} {{.*}}$ORIGIN/../lib/swift/linux
+# CHECK: {{.*}} {{\(RPATH\)|\(RUNPATH\)}} {{.*}}$ORIGIN/../lib/swift/linux

test-sourcekit-lsp/test-sourcekit-lsp.py

@@ -122,9 +122,8 @@ def main():
       'position': { 'line': 2, 'character': 22}, ## zero-based
       })
     # CHECK: "items":[
-    # FIXME: Extra space?
-    # CHECK-DAG: "label":" clib_func()"
-    # CHECK-DAG: "label":" clib_other()"
+    # CHECK-DAG: "insertText":"clib_func"
+    # CHECK-DAG: "insertText":"clib_other"
     # CHECK: ]
 
     lsp.request('shutdown', {})
@@ -135,7 +134,8 @@ def main():
     print('')
     print('==== OUTPUT ====')
 
-    p = subprocess.Popen([args.sourcekit_lsp, '--sync'], stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+    skargs = [args.sourcekit_lsp, '--sync', '-Xclangd', '-sync']
+    p = subprocess.Popen(skargs, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
     out, _ = p.communicate(lsp.script)
     print(out)
     print('')