test-zstd-speed.py: added --verbose option

dev
inikep 2016-07-19 15:49:14 +02:00
parent 6e5beea715
commit 8c53ad53b1
1 changed files with 28 additions and 21 deletions

View File

@ -15,13 +15,15 @@ working_path = os.getcwd() + '/' + working_dir_name # /path/to/zstd/tests/sp
clone_path = working_path + '/' + 'zstd' # /path/to/zstd/tests/speedTest/zstd clone_path = working_path + '/' + 'zstd' # /path/to/zstd/tests/speedTest/zstd
email_header = '[ZSTD_speedTest]' email_header = '[ZSTD_speedTest]'
pid = str(os.getpid()) pid = str(os.getpid())
verbose = False
def log(text): def log(text):
print(time.strftime("%Y/%m/%d %H:%M:%S") + ' - ' + text) print(time.strftime("%Y/%m/%d %H:%M:%S") + ' - ' + text)
def execute(command, print_output=False, print_error=True, param_shell=True): def execute(command, print_command=True, print_output=False, print_error=True, param_shell=True):
if print_command:
log("> " + command) log("> " + command)
popen = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=param_shell, cwd=execute.cwd) popen = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, shell=param_shell, cwd=execute.cwd)
stdout = popen.communicate()[0] stdout = popen.communicate()[0]
@ -38,7 +40,7 @@ execute.cwd = None
def does_command_exist(command): def does_command_exist(command):
try: try:
execute(command, False, False); execute(command, verbose, False, False);
except Exception as e: except Exception as e:
return False return False
return True return True
@ -50,9 +52,9 @@ def send_email(emails, topic, text, have_mutt, have_mail):
myfile.writelines(text) myfile.writelines(text)
myfile.close() myfile.close()
if have_mutt: if have_mutt:
execute('mutt -s "' + topic + '" ' + emails + ' < ' + logFileName) execute('mutt -s "' + topic + '" ' + emails + ' < ' + logFileName, verbose)
elif have_mail: elif have_mail:
execute('mail -s "' + topic + '" ' + emails + ' < ' + logFileName) execute('mail -s "' + topic + '" ' + emails + ' < ' + logFileName, verbose)
else: else:
log("e-mail cannot be sent (mail or mutt not found)") log("e-mail cannot be sent (mail or mutt not found)")
@ -71,8 +73,8 @@ def send_email_with_attachments(branch, commit, last_commit, emails, text, resul
def git_get_branches(): def git_get_branches():
execute('git fetch -p') execute('git fetch -p', verbose)
branches = execute('git branch -rl') branches = execute('git branch -rl', verbose)
output = [] output = []
for line in branches: for line in branches:
if ("HEAD" not in line) and ("coverity_scan" not in line) and ("gh-pages" not in line): if ("HEAD" not in line) and ("coverity_scan" not in line) and ("gh-pages" not in line):
@ -183,7 +185,9 @@ if __name__ == '__main__':
parser.add_argument('--lastCLevel', type=int, help='last compression level for testing', default=5) parser.add_argument('--lastCLevel', type=int, help='last compression level for testing', default=5)
parser.add_argument('--sleepTime', type=int, help='frequency of repository checking in seconds', default=300) parser.add_argument('--sleepTime', type=int, help='frequency of repository checking in seconds', default=300)
parser.add_argument('--dry-run', dest='dry_run', action='store_true', help='not build', default=False) parser.add_argument('--dry-run', dest='dry_run', action='store_true', help='not build', default=False)
parser.add_argument('--verbose', action='store_true', help='more verbose logs', default=False)
args = parser.parse_args() args = parser.parse_args()
verbose = args.verbose
# check if test files are accessible # check if test files are accessible
testFileNames = args.testFileNames.split() testFileNames = args.testFileNames.split()
@ -203,6 +207,7 @@ if __name__ == '__main__':
log("ERROR: e-mail senders 'mail' or 'mutt' not found") log("ERROR: e-mail senders 'mail' or 'mutt' not found")
exit(1) exit(1)
if verbose:
print("PARAMETERS:\nrepoURL=%s" % args.repoURL) print("PARAMETERS:\nrepoURL=%s" % args.repoURL)
print("working_path=%s" % working_path) print("working_path=%s" % working_path)
print("clone_path=%s" % clone_path) print("clone_path=%s" % clone_path)
@ -214,6 +219,7 @@ if __name__ == '__main__':
print("lastCLevel=%s" % args.lastCLevel) print("lastCLevel=%s" % args.lastCLevel)
print("sleepTime=%s" % args.sleepTime) print("sleepTime=%s" % args.sleepTime)
print("dry_run=%s" % args.dry_run) print("dry_run=%s" % args.dry_run)
print("verbose=%s" % args.verbose)
print("have_mutt=%s have_mail=%s" % (have_mutt, have_mail)) print("have_mutt=%s have_mail=%s" % (have_mutt, have_mail))
# clone ZSTD repo if needed # clone ZSTD repo if needed
@ -242,7 +248,7 @@ if __name__ == '__main__':
if (loadavg <= args.maxLoadAvg): if (loadavg <= args.maxLoadAvg):
branches = git_get_branches() branches = git_get_branches()
for branch in branches: for branch in branches:
commit = execute('git show -s --format=%h ' + branch)[0] commit = execute('git show -s --format=%h ' + branch, verbose)[0]
last_commit = update_config_file(branch, commit) last_commit = update_config_file(branch, commit)
if commit == last_commit: if commit == last_commit:
log("skipping branch %s: head %s already processed" % (branch, commit)) log("skipping branch %s: head %s already processed" % (branch, commit))
@ -253,6 +259,7 @@ if __name__ == '__main__':
test_commit(branch, commit, last_commit, args, testFilePaths, have_mutt, have_mail) test_commit(branch, commit, last_commit, args, testFilePaths, have_mutt, have_mail)
else: else:
log("WARNING: main loadavg=%.2f is higher than %s" % (loadavg, args.maxLoadAvg)) log("WARNING: main loadavg=%.2f is higher than %s" % (loadavg, args.maxLoadAvg))
if verbose:
log("sleep for %s seconds" % args.sleepTime) log("sleep for %s seconds" % args.sleepTime)
time.sleep(args.sleepTime) time.sleep(args.sleepTime)
except Exception as e: except Exception as e: