Blob Blame History Raw
diff -Naur swift-integration-tests-orig/test-snapshot-binaries/linux_load_commands.py swift-integration-tests/test-snapshot-binaries/linux_load_commands.py
--- swift-integration-tests-orig/test-snapshot-binaries/linux_load_commands.py	2019-10-07 17:57:28.000000000 -0500
+++ swift-integration-tests/test-snapshot-binaries/linux_load_commands.py	2020-01-29 14:05:33.991180706 -0600
@@ -85,12 +85,12 @@
     numberOfLinesSeen = 0
 
     print("Visiting lib: {}".format(lib))
-    lines = list(reversed(subprocess.check_output([args.read_elf, "-program-headers", lib]).split("\n")[:-1]))
+    lines = list(reversed(subprocess.check_output([args.read_elf, "-program-headers", lib]).split(b"\n")[:-1]))
     p = ParseState()
 
     # Until we finish parsing or run out of lines to parse...
     while len(lines) > 0:
-        l = lines.pop()
+        l = lines.pop().decode("utf-8")
         print("DUMP: '{}'".format(l))
         assert(p is not None)
         curState = p
@@ -143,7 +143,7 @@
         "-iname",
         "*.so"
     ]
-    return subprocess.check_output(cmd).split("\n")[:-1]
+    return subprocess.check_output(cmd).split(b"\n")[:-1]
 
 def main():
     parser = argparse.ArgumentParser()
@@ -154,7 +154,7 @@
 
     libraries = get_libraries(args.package_path)
     for l in libraries:
-          process_library(args, l)
+          process_library(args, l.decode("utf-8"))
     sys.exit(0)
 
 if __name__ == "__main__":
diff -Naur swift-integration-tests-orig/test-sourcekit-lsp/test-sourcekit-lsp.py swift-integration-tests/test-sourcekit-lsp/test-sourcekit-lsp.py
--- swift-integration-tests-orig/test-sourcekit-lsp/test-sourcekit-lsp.py	2019-10-07 17:57:28.000000000 -0500
+++ swift-integration-tests/test-sourcekit-lsp/test-sourcekit-lsp.py	2020-01-29 18:35:26.953725332 -0600
@@ -136,7 +136,7 @@
 
     skargs = [args.sourcekit_lsp, '--sync', '-Xclangd', '-sync']
     p = subprocess.Popen(skargs, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
-    out, _ = p.communicate(lsp.script)
+    out, _ = p.communicate(lsp.script.encode())
     print(out)
     print('')