lib/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-07-30 22:23:13 +03:00
Code Activity

test-zstd-versions.py: fixed DEVNULL

Browse Source
This commit is contained in:
inikep
2016-06-17 13:39:43 +02:00
parent d1af4e66b6
commit 4545671b44
1 changed files with 12 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,9 +7,9 @@ import glob
import hashlib import hashlib
import os import os
import shutil import shutil
import subprocess
import sys import sys
from subprocess import Popen, PIPE import subprocess
from subprocess import Popen, PIPE, DEVNULL
repo_url = 'https://github.com/Cyan4973/zstd.git' repo_url = 'https://github.com/Cyan4973/zstd.git'
tmp_dir_name = 'tests/versionsTest' tmp_dir_name = 'tests/versionsTest'
@ -25,31 +25,25 @@ dict_files += './zstd/programs/*.h ./zstd/lib/common/*.h ./zstd/lib/compress/*.h
def execute(command, print_output=False, print_error=True): def execute(command, print_output=False, print_error=True):
popen = Popen(command, stdout=PIPE, stderr=PIPE, shell=True) popen = Popen(command, stdout=PIPE, stderr=PIPE, shell=True)
itout = iter(popen.stdout.readline, b"") stdout_lines, stderr_lines = popen.communicate()
iterr = iter(popen.stderr.readline, b"") stderr_lines = stderr_lines.decode("utf-8")
stdout_lines = b''.join(list(itout)).decode("utf-8") stdout_lines = stdout_lines.decode("utf-8")
if print_output: if print_output:
print(stdout_lines) print(stdout_lines)
stderr_lines = b''.join(list(iterr)).decode("utf-8")
if print_output:
print(stderr_lines) print(stderr_lines)
popen.communicate()
if popen.returncode is not None and popen.returncode != 0: if popen.returncode is not None and popen.returncode != 0:
if not print_output and print_error: if not print_output and print_error:
print(stderr_lines) print(stderr_lines)
raise RuntimeError(stderr_lines) return popen.returncode
return stdout_lines + stderr_lines
def proc(cmd_args, pipe=True, dummy=False): def proc(cmd_args, pipe=True, dummy=False):
if dummy: if dummy:
return return
if pipe: if pipe:
subproc = subprocess.Popen(cmd_args, subproc = Popen(cmd_args, stdout=PIPE, stderr=PIPE)
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
else: else:
subproc = subprocess.Popen(cmd_args) subproc = Popen(cmd_args)
return subproc.communicate() return subproc.communicate()
@ -72,18 +66,16 @@ 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")
execute('./zstd.' + tag + ' -f --train ' + ' '.join(cFiles) + ' ' + ' '.join(hFiles) + ' -o ' + dict_name) if execute('./zstd.' + tag + ' -f --train ' + ' '.join(cFiles) + ' ' + ' '.join(hFiles) + ' -o ' + dict_name, print_output=False) == 0:
print(dict_name + ' created') print(dict_name + ' created')
else:
print('ERROR: creating of ' + dict_name + ' failed')
else: else:
print(dict_name + ' already exists') print(dict_name + ' already exists')
def dict_compress_sample(tag, sample): def dict_compress_sample(tag, sample):
dict_name = 'dict.' + tag dict_name = 'dict.' + tag
try:
from subprocess import DEVNULL # py3k
except ImportError:
DEVNULL = open(os.devnull, 'wb')
subprocess.call(['./zstd.' + tag, '-D', dict_name, '-f', sample, '-o', sample + '_01_64_' + tag + '_dictio.zst'], stderr=DEVNULL) subprocess.call(['./zstd.' + tag, '-D', dict_name, '-f', sample, '-o', sample + '_01_64_' + tag + '_dictio.zst'], stderr=DEVNULL)
subprocess.call(['./zstd.' + tag, '-D', dict_name, '-5f', sample, '-o', sample + '_05_64_' + tag + '_dictio.zst'], stderr=DEVNULL) subprocess.call(['./zstd.' + tag, '-D', dict_name, '-5f', sample, '-o', sample + '_05_64_' + tag + '_dictio.zst'], stderr=DEVNULL)
subprocess.call(['./zstd.' + tag, '-D', dict_name, '-9f', sample, '-o', sample + '_09_64_' + tag + '_dictio.zst'], stderr=DEVNULL) subprocess.call(['./zstd.' + tag, '-D', dict_name, '-9f', sample, '-o', sample + '_09_64_' + tag + '_dictio.zst'], stderr=DEVNULL)
@ -95,10 +87,6 @@ def dict_compress_sample(tag, sample):
def compress_sample(tag, sample): def compress_sample(tag, sample):
try:
from subprocess import DEVNULL # py3k
except ImportError:
DEVNULL = open(os.devnull, 'wb')
if subprocess.call(['./zstd.' + tag, '-f', sample], stderr=DEVNULL) == 0: if subprocess.call(['./zstd.' + tag, '-f', sample], stderr=DEVNULL) == 0:
os.rename(sample + '.zst', sample + '_01_64_' + tag + '_nodict.zst') os.rename(sample + '.zst', sample + '_01_64_' + tag + '_nodict.zst')
if subprocess.call(['./zstd.' + tag, '-5f', sample], stderr=DEVNULL) == 0: if subprocess.call(['./zstd.' + tag, '-5f', sample], stderr=DEVNULL) == 0:
@ -137,10 +125,6 @@ def remove_duplicates():
def decompress_zst(tag, zstd_up_to_v05=False): def decompress_zst(tag, zstd_up_to_v05=False):
dec_error = 0 dec_error = 0
list_zst = sorted(glob.glob('*_nodict.zst')) list_zst = sorted(glob.glob('*_nodict.zst'))
try:
from subprocess import DEVNULL # py3k
except ImportError:
DEVNULL = open(os.devnull, 'wb')
for file_zst in list_zst: for file_zst in list_zst:
print(file_zst, end=' ') print(file_zst, end=' ')
print(tag, end=' ') print(tag, end=' ')
@ -163,10 +147,6 @@ def decompress_zst(tag, zstd_up_to_v05=False):
def decompress_dict(tag, zstd_up_to_v05=False): def decompress_dict(tag, zstd_up_to_v05=False):
dec_error = 0 dec_error = 0
list_zst = sorted(glob.glob('*_dictio.zst')) list_zst = sorted(glob.glob('*_dictio.zst'))
try:
from subprocess import DEVNULL # py3k
except ImportError:
DEVNULL = open(os.devnull, 'wb')
for file_zst in list_zst: for file_zst in list_zst:
dict_tag = file_zst[0:len(file_zst)-11] # remove "_dictio.zst" dict_tag = file_zst[0:len(file_zst)-11] # remove "_dictio.zst"
if head in dict_tag: # find vdevel if head in dict_tag: # find vdevel