fixed typos, added command line arguments check to regresion_read.py
This commit is contained in:
11
alloy.py
11
alloy.py
@@ -330,9 +330,13 @@ def build_ispc(version_LLVM, make):
|
|||||||
if options.debug == True:
|
if options.debug == True:
|
||||||
folder += "dbg"
|
folder += "dbg"
|
||||||
|
|
||||||
p = subprocess.Popen("svnversion " + folder, shell=True, \
|
p = subprocess.Popen("svn info " + folder, shell=True, \
|
||||||
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||||
(revision_llvm, err) = p.communicate()
|
(info_llvm, err) = p.communicate()
|
||||||
|
info_llvm = re.split('\n', info_llvm)
|
||||||
|
for i in info_llvm:
|
||||||
|
if len(i) > 0 and i.startswith("Last Changed Rev: "):
|
||||||
|
common.ex_state.switch_revision(str(i[len("Last Changed Rev: "):]))
|
||||||
|
|
||||||
try_do_LLVM("recognize LLVM revision", "svn info " + folder, True)
|
try_do_LLVM("recognize LLVM revision", "svn info " + folder, True)
|
||||||
try_do_LLVM("build ISPC with LLVM version " + version_LLVM + " ", make_ispc, True)
|
try_do_LLVM("build ISPC with LLVM version " + version_LLVM + " ", make_ispc, True)
|
||||||
@@ -641,7 +645,7 @@ def validation_run(only, only_targets, reference_branch, number, notify, update,
|
|||||||
attach_mail_file(msg, performance.in_file, "performance.log")
|
attach_mail_file(msg, performance.in_file, "performance.log")
|
||||||
attach_mail_file(msg, "." + os.sep + "logs" + os.sep + "perf_build.log", "perf_build.log")
|
attach_mail_file(msg, "." + os.sep + "logs" + os.sep + "perf_build.log", "perf_build.log")
|
||||||
# dumping gathered info to the file
|
# dumping gathered info to the file
|
||||||
commom.ex_state.dump(alloy_folder + "test_table.dump", commom.ex_state.tt)
|
common.ex_state.dump(alloy_folder + "test_table.dump", common.ex_state.tt)
|
||||||
# sending e-mail with results
|
# sending e-mail with results
|
||||||
if options.notify != "":
|
if options.notify != "":
|
||||||
fp = open(os.environ["ISPC_HOME"] + os.sep + "notify_log.log", 'rb')
|
fp = open(os.environ["ISPC_HOME"] + os.sep + "notify_log.log", 'rb')
|
||||||
@@ -762,6 +766,7 @@ import datetime
|
|||||||
import copy
|
import copy
|
||||||
import multiprocessing
|
import multiprocessing
|
||||||
import subprocess
|
import subprocess
|
||||||
|
import re
|
||||||
from email.MIMEMultipart import MIMEMultipart
|
from email.MIMEMultipart import MIMEMultipart
|
||||||
from email.MIMEBase import MIMEBase
|
from email.MIMEBase import MIMEBase
|
||||||
from email.mime.text import MIMEText
|
from email.mime.text import MIMEText
|
||||||
|
|||||||
@@ -52,14 +52,17 @@ if __name__ == '__main__':
|
|||||||
return self.epilog
|
return self.epilog
|
||||||
|
|
||||||
examples = ("Examples:\n" +
|
examples = ("Examples:\n" +
|
||||||
"Load test_table object\n\tregression_read.py -l\n")
|
"Load test_table object\n\tregression_read.py -l 'test_table.dump'\n")
|
||||||
|
|
||||||
parser = MyParser(usage="Usage: regression_read.py -l [options]", epilog=examples)
|
parser = MyParser(usage="Usage: regression_read.py -l [options]", epilog=examples)
|
||||||
parser.add_option('-l', '--load-tt', dest='load_tt',
|
parser.add_option('-l', '--load-tt', dest='load_tt',
|
||||||
help='load test_table.dump from file', default=None)
|
help='load TestTable() from file', default=None)
|
||||||
|
|
||||||
(options, args) = parser.parse_args()
|
(options, args) = parser.parse_args()
|
||||||
|
if (options.load_tt == None):
|
||||||
|
parser.print_help()
|
||||||
|
exit(0)
|
||||||
|
|
||||||
tt = read_test_table(options.load_tt)
|
tt = read_test_table(options.load_tt)
|
||||||
print tt
|
print tt
|
||||||
print "\n\n ------------------------\n\n"
|
print "\n\n ------------------------\n\n"
|
||||||
|
|||||||
Reference in New Issue
Block a user