Loading...
--- dyld/dyld-960/testing/kernel-cache-tests/KernelCollection.py
+++ dyld/dyld-1042.1/testing/kernel-cache-tests/KernelCollection.py
@@ -1,10 +1,9 @@
-#!/usr/bin/python2.7
+#!/usr/bin/python3
import string
import os
import json
import sys
-import commands
import subprocess
@@ -44,25 +43,27 @@
self.dict = {}
if self.print_json:
- print "Run with: " + runline
- process = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- self.json_text, self.error_message = process.communicate()
- if self.print_json:
- print self.json_text
- print self.error_message
- if process.returncode:
- if not self.print_json:
- print self.error_message
- print "Non-zero return code"
- print "Run with: " + runline
- sys.exit(0)
- #print self.json_text
- #print self.error_message
- if self.json_text:
- self.dict = json.loads(self.json_text)
- self.error_message = ""
- except subprocess.CalledProcessError as e:
- #print "can't make closure for " + kernel_cache_path
+ print("Run with: " + runline)
+ process = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ self.json_text, self.error_message = process.communicate()
+ self.json_text = self.json_text.decode()
+ self.error_message = self.error_message.decode()
+ if self.print_json:
+ print(self.json_text)
+ print(self.error_message)
+ if process.returncode:
+ if not self.print_json:
+ print(self.error_message)
+ print("Non-zero return code")
+ print("Run with: " + runline)
+ sys.exit(0)
+ #print self.json_text
+ #print self.error_message
+ if self.json_text:
+ self.dict = json.loads(self.json_text)
+ self.error_message = ""
+ except subprocess.CalledProcessError as e:
+ #print("can't make closure for " + kernel_cache_path)
self.error_message = e.output
self.dict = {}
except:
@@ -89,25 +90,27 @@
args.append(opt)
self.dict = {}
if self.print_json:
- print "Run with: " + ' '.join(args)
- process = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- self.json_text, self.error_message = process.communicate()
- if self.print_json:
- print self.json_text
- print self.error_message
- if process.returncode:
- if not self.print_json:
- print self.error_message
- print "Non-zero return code"
- print "Run with: " + ' '.join(args)
- sys.exit(0)
- #print self.json_text
- #print self.error_message
- if self.json_text:
- self.dict = json.loads(self.json_text)
- self.error_message = ""
- except subprocess.CalledProcessError as e:
- #print "can't make closure for " + kernel_cache_path
+ print("Run with: " + ' '.join(args))
+ process = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ self.json_text, self.error_message = process.communicate()
+ self.json_text = self.json_text.decode()
+ self.error_message = self.error_message.decode()
+ if self.print_json:
+ print(self.json_text)
+ print(self.error_message)
+ if process.returncode:
+ if not self.print_json:
+ print(self.error_message)
+ print("Non-zero return code")
+ print("Run with: " + ' '.join(args))
+ sys.exit(0)
+ #print self.json_text
+ #print self.error_message
+ if self.json_text:
+ self.dict = json.loads(self.json_text)
+ self.error_message = ""
+ except subprocess.CalledProcessError as e:
+ #print("can't make closure for " + kernel_cache_path)
self.error_message = e.output
self.dict = {}
except:
@@ -137,25 +140,27 @@
args.append(opt)
self.dict = {}
if self.print_json:
- print "Run with: " + ' '.join(args)
- process = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- self.json_text, self.error_message = process.communicate()
- if self.print_json:
- print self.json_text
- print self.error_message
- if process.returncode:
- if not self.print_json:
- print self.error_message
- print "Non-zero return code"
- print "Run with: " + ' '.join(args)
- sys.exit(0)
- #print self.json_text
- #print self.error_message
- if self.json_text:
- self.dict = json.loads(self.json_text)
- self.error_message = ""
- except subprocess.CalledProcessError as e:
- #print "can't make closure for " + kernel_cache_path
+ print("Run with: " + ' '.join(args))
+ process = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ self.json_text, self.error_message = process.communicate()
+ self.json_text = self.json_text.decode()
+ self.error_message = self.error_message.decode()
+ if self.print_json:
+ print(self.json_text)
+ print(self.error_message)
+ if process.returncode:
+ if not self.print_json:
+ print(self.error_message)
+ print("Non-zero return code")
+ print("Run with: " + ' '.join(args))
+ sys.exit(0)
+ #print self.json_text
+ #print self.error_message
+ if self.json_text:
+ self.dict = json.loads(self.json_text)
+ self.error_message = ""
+ except subprocess.CalledProcessError as e:
+ #print("can't make closure for " + kernel_cache_path)
self.error_message = e.output
self.dict = {}
except:
@@ -173,25 +178,27 @@
args.append(opt)
self.dict = {}
if self.print_json:
- print "Run with: " + ' '.join(args)
- process = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- self.json_text, self.error_message = process.communicate()
- if self.print_json:
- print self.json_text
- print self.error_message
- if process.returncode:
- if not self.print_json:
- print self.error_message
- print "Non-zero return code"
- print "Run with: " + ' '.join(args)
- sys.exit(0)
- #print self.json_text
- #print self.error_message
- if self.json_text:
- self.dict = json.loads(self.json_text)
- self.error_message = ""
- except subprocess.CalledProcessError as e:
- #print "can't make closure for " + app_cache_path
+ print("Run with: " + ' '.join(args))
+ process = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ self.json_text, self.error_message = process.communicate()
+ self.json_text = self.json_text.decode()
+ self.error_message = self.error_message.decode()
+ if self.print_json:
+ print(self.json_text)
+ print(self.error_message)
+ if process.returncode:
+ if not self.print_json:
+ print(self.error_message)
+ print("Non-zero return code")
+ print("Run with: " + ' '.join(args))
+ sys.exit(0)
+ #print self.json_text
+ #print self.error_message
+ if self.json_text:
+ self.dict = json.loads(self.json_text)
+ self.error_message = ""
+ except subprocess.CalledProcessError as e:
+ #print("can't make closure for " + app_cache_path)
self.error_message = e.output
self.dict = {}
except: