From 5151c30dce029e5efe9f6ac9ef137bb422ad30fd Mon Sep 17 00:00:00 2001 From: Takayuki MATSUOKA Date: Fri, 15 May 2015 23:21:52 +0900 Subject: Add log of same files and sha1 hash of unique files to versionstest --- test/test-lz4-versions.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/test/test-lz4-versions.py b/test/test-lz4-versions.py index b6ed126..f92fa96 100644 --- a/test/test-lz4-versions.py +++ b/test/test-lz4-versions.py @@ -6,6 +6,7 @@ import filecmp import os import shutil import sys +import hashlib repo_url = 'https://github.com/Cyan4973/lz4.git' tmp_dir_name = 'test/lz4test' @@ -37,6 +38,11 @@ def get_git_tags(): tags = stdout.decode('utf-8').split() return tags +# http://stackoverflow.com/a/19711609/2132223 +def sha1_of_file(filepath): + with open(filepath, 'rb') as f: + return hashlib.sha1(f.read()).hexdigest() + if __name__ == '__main__': error_code = 0 base_dir = os.getcwd() + '/..' # /path/to/lz4 @@ -102,6 +108,7 @@ if __name__ == '__main__': continue if filecmp.cmp(lz4, lz4t): os.remove(lz4t) + print('{} == {}'.format(lz4, lz4t)) print('Enumerate only different compressed files') lz4s = sorted(glob.glob('*.lz4')) @@ -128,6 +135,10 @@ if __name__ == '__main__': else: os.remove(dec) + lz4s = sorted(glob.glob('*.lz4')) + for lz4 in lz4s: + print('{} {}'.format(sha1_of_file(lz4), lz4)) + if error_code != 0: print('ERROR') -- cgit v0.12 From a8fdeb46762d7dd31af49c956af3ac4e48718128 Mon Sep 17 00:00:00 2001 From: Takayuki MATSUOKA Date: Fri, 15 May 2015 23:44:48 +0900 Subject: Add log output of succeeded decompression to test script --- test/test-lz4-versions.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/test-lz4-versions.py b/test/test-lz4-versions.py index f92fa96..259b19a 100644 --- a/test/test-lz4-versions.py +++ b/test/test-lz4-versions.py @@ -98,6 +98,8 @@ if __name__ == '__main__': print(lz4 + ' : ' + repr(os.path.getsize(lz4))) # Remove duplicated .lz4 files + print('') + print('Duplicated files') lz4s = sorted(glob.glob('*.lz4')) for i, lz4 in enumerate(lz4s): if not os.path.isfile(lz4): @@ -133,8 +135,11 @@ if __name__ == '__main__': print('ERR : ' + dec) error_code = 1 else: + print('OK : ' + dec) os.remove(dec) + print('') + print('Unique .lz4 files') lz4s = sorted(glob.glob('*.lz4')) for lz4 in lz4s: print('{} {}'.format(sha1_of_file(lz4), lz4)) -- cgit v0.12 From ffff9ee1380c0095c9627beb18a12838712d8a0e Mon Sep 17 00:00:00 2001 From: Takayuki MATSUOKA Date: Sat, 16 May 2015 14:58:27 +0900 Subject: Support iterative edit and testing This commit will allows iterative edit and testing to local working copy. You could iterate edit and testing by the following commands: cd /path/to/lz4 cd test make versionstest my-favorite-text-editor ../lib/lz4.c make versionstest my-favorite-text-editor ./test-lz4-versions.py make versionstest ... --- test/test-lz4-versions.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/test-lz4-versions.py b/test/test-lz4-versions.py index 259b19a..f157ab7 100644 --- a/test/test-lz4-versions.py +++ b/test/test-lz4-versions.py @@ -68,16 +68,17 @@ if __name__ == '__main__': os.chdir(base_dir) dst_lz4c = '{}/lz4c.{}' .format(tmp_dir, tag) # /path/to/lz4/test/lz4test/lz4c. dst_lz4c32 = '{}/lz4c32.{}'.format(tmp_dir, tag) # /path/to/lz4/test/lz4test/lz4c32. - if not os.path.isfile(dst_lz4c) or not os.path.isfile(dst_lz4c32): + if not os.path.isfile(dst_lz4c) or not os.path.isfile(dst_lz4c32) or tag == head: if tag != head: r_dir = '{}/{}'.format(tmp_dir, tag) # /path/to/lz4/test/lz4test/ os.makedirs(r_dir, exist_ok=True) os.chdir(clone_dir) git(['--work-tree=' + r_dir, 'checkout', tag, '--', '.'], False) os.chdir(r_dir + '/programs') # /path/to/lz4/lz4test//programs + make(['clean', 'lz4c', 'lz4c32'], False) else: os.chdir(programs_dir) - make(['clean', 'lz4c', 'lz4c32'], False) + make(['lz4c', 'lz4c32'], False) shutil.copy2('lz4c', dst_lz4c) shutil.copy2('lz4c32', dst_lz4c32) @@ -120,6 +121,8 @@ if __name__ == '__main__': # Decompress remained .lz4 files by all released lz4c and lz4c32 print('Decompression tests and verifications') lz4s = sorted(glob.glob('*.lz4')) + for dec in glob.glob("*.dec"): + os.remove(dec) for lz4 in lz4s: print(lz4, end=" ") for tag in tags: -- cgit v0.12 From e769a0eab092367cfacd1c5225d0b21a8c745617 Mon Sep 17 00:00:00 2001 From: Takayuki MATSUOKA Date: Wed, 20 May 2015 20:00:38 +0900 Subject: Combine unique .lz4 file info --- test/test-lz4-versions.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/test/test-lz4-versions.py b/test/test-lz4-versions.py index f157ab7..5531a05 100644 --- a/test/test-lz4-versions.py +++ b/test/test-lz4-versions.py @@ -116,7 +116,7 @@ if __name__ == '__main__': print('Enumerate only different compressed files') lz4s = sorted(glob.glob('*.lz4')) for lz4 in lz4s: - print(lz4 + ' : ' + repr(os.path.getsize(lz4))) + print(lz4 + ' : ' + repr(os.path.getsize(lz4)) + ', ' + sha1_of_file(lz4)) # Decompress remained .lz4 files by all released lz4c and lz4c32 print('Decompression tests and verifications') @@ -141,12 +141,6 @@ if __name__ == '__main__': print('OK : ' + dec) os.remove(dec) - print('') - print('Unique .lz4 files') - lz4s = sorted(glob.glob('*.lz4')) - for lz4 in lz4s: - print('{} {}'.format(sha1_of_file(lz4), lz4)) - if error_code != 0: print('ERROR') -- cgit v0.12