facebook/zstd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test-zstd-versions.py: improved error handling

Browse Source
This commit is contained in:
inikep 2016-06-17 14:07:42 +02:00
parent 4545671b44
commit 2ef16501ca
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/test-zstd-versions.py
View File

@ -23,8 +23,8 @@ dict_files = './zstd/programs/*.c ./zstd/lib/common/*.c ./zstd/lib/compress/*.c
dict_files += './zstd/programs/*.h ./zstd/lib/common/*.h ./zstd/lib/compress/*.h ./zstd/lib/dictBuilder/*.h ./zstd/lib/legacy/*.h' dict_files += './zstd/programs/*.h ./zstd/lib/common/*.h ./zstd/lib/compress/*.h ./zstd/lib/dictBuilder/*.h ./zstd/lib/legacy/*.h'
def execute(command, print_output=False, print_error=True): def execute(command, print_output=False, print_error=True, param_shell=False):
popen = Popen(command, stdout=PIPE, stderr=PIPE, shell=True) popen = Popen(command, stdout=PIPE, stderr=PIPE, shell=param_shell)
stdout_lines, stderr_lines = popen.communicate() stdout_lines, stderr_lines = popen.communicate()
stderr_lines = stderr_lines.decode("utf-8") stderr_lines = stderr_lines.decode("utf-8")
stdout_lines = stdout_lines.decode("utf-8") stdout_lines = stdout_lines.decode("utf-8")
@ -66,7 +66,7 @@ def create_dict(tag, dict_source_path):
if not os.path.isfile(dict_name): if not os.path.isfile(dict_name):
cFiles = glob.glob(dict_source_path + "/*.c") cFiles = glob.glob(dict_source_path + "/*.c")
hFiles = glob.glob(dict_source_path + "/*.h") hFiles = glob.glob(dict_source_path + "/*.h")
if execute('./zstd.' + tag + ' -f --train ' + ' '.join(cFiles) + ' ' + ' '.join(hFiles) + ' -o ' + dict_name, print_output=False) == 0: if execute('./zstd.' + tag + ' -f --train ' + ' '.join(cFiles) + ' ' + ' '.join(hFiles) + ' -o ' + dict_name, print_output=False, param_shell=True) == 0:
print(dict_name + ' created') print(dict_name + ' created')
else: else:
print('ERROR: creating of ' + dict_name + ' failed') print('ERROR: creating of ' + dict_name + ' failed')
@ -133,7 +133,7 @@ def decompress_zst(tag, zstd_up_to_v05=False):
params = ['./zstd.' + tag, '-df', file_zst, file_dec] params = ['./zstd.' + tag, '-df', file_zst, file_dec]
else: else:
params = ['./zstd.' + tag, '-df', file_zst, '-o', file_dec] params = ['./zstd.' + tag, '-df', file_zst, '-o', file_dec]
if subprocess.call(params, stderr=DEVNULL) == 0: if execute(params) == 0:
if not filecmp.cmp(file_dec, test_dat): if not filecmp.cmp(file_dec, test_dat):
print('ERR !! ') print('ERR !! ')
dec_error = 1 dec_error = 1
@ -160,7 +160,7 @@ def decompress_dict(tag, zstd_up_to_v05=False):
params = ['./zstd.' + tag, '-D', dict_name, '-df', file_zst, file_dec] params = ['./zstd.' + tag, '-D', dict_name, '-df', file_zst, file_dec]
else: else:
params = ['./zstd.' + tag, '-D', dict_name, '-df', file_zst, '-o', file_dec] params = ['./zstd.' + tag, '-D', dict_name, '-df', file_zst, '-o', file_dec]
if subprocess.call(params, stderr=DEVNULL) == 0: if execute(params) == 0:
if not filecmp.cmp(file_dec, test_dat): if not filecmp.cmp(file_dec, test_dat):
print('ERR !! ') print('ERR !! ')
dec_error = 1 dec_error = 1
@ -221,10 +221,7 @@ if __name__ == '__main__':
if not os.path.isdir(dict_source_path): if not os.path.isdir(dict_source_path):
os.mkdir(dict_source_path) os.mkdir(dict_source_path)
print('cp ' + dict_files + ' ' + dict_source_path) print('cp ' + dict_files + ' ' + dict_source_path)
subprocess.call(['cp ' + dict_files + ' ' + dict_source_path], shell=True) execute('cp ' + dict_files + ' ' + dict_source_path, param_shell=True)
dictFiles = glob.glob("dict*")
print('dictFiles=' + str(dictFiles))
print('Compress test.dat by all released zstd') print('Compress test.dat by all released zstd')