From a1a67927f566a7c6b8e44f23a6ab76ceb19dd490 Mon Sep 17 00:00:00 2001 From: Jonathan Dieter Date: Wed, 1 Aug 2018 18:19:36 +0100 Subject: [PATCH] Fix tests so they work with zstd <= 1.3.4 as well as 1.3.5+ Signed-off-by: Jonathan Dieter --- test/meson.build | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/test/meson.build b/test/meson.build index 2c9af81..c052cfb 100644 --- a/test/meson.build +++ b/test/meson.build @@ -140,49 +140,69 @@ test( join_paths(file_path, 'LICENSE.manual.dict.fodt.zck') ] ) + +check_sha = '0418aaca75b6b64c3ac9bc50fc0974e48c76691869977907fad25eea834f3c85' +if zstd_dep.version().version_compare('<=1.3.4') + check_sha = '08c9ce94470ad4ab7f8a64e67872e138964eb562d13686d9c941baa3a09d2835' +endif test( 'compress auto-chunked file - no dict', shacheck, args: [ zck, 'LICENSE.nodict.fodt.zck', - '0418aaca75b6b64c3ac9bc50fc0974e48c76691869977907fad25eea834f3c85', + check_sha, '-o', 'LICENSE.nodict.fodt.zck', join_paths(file_path, 'LICENSE.fodt') ] ) + +check_sha = 'fedf75caa19cc03383b2a2abac75a490360f9bab6419c9f9241bae584fe64f04' +if zstd_dep.version().version_compare('<=1.3.4') + check_sha = '0512327cc771a73c23377dd3804fffcaa557dd03cfd980dae22100f7b2193255' +endif test( 'compress auto-chunked file - dict', shacheck, args: [ zck, 'LICENSE.dict.fodt.zck', - 'fedf75caa19cc03383b2a2abac75a490360f9bab6419c9f9241bae584fe64f04', + check_sha, '-D', join_paths(file_path, 'LICENSE.dict'), '-o', 'LICENSE.dict.fodt.zck', join_paths(file_path, 'LICENSE.fodt') ] ) + +check_sha = 'cba69c5fc88fda4352470f3eb0fe5df04e9f1f08c88e0af5a96e53ed3f84526c' +if zstd_dep.version().version_compare('<=1.3.4') + check_sha = '53205d490819bbb681224e21acf0b85ec44c62c5c1f46e59bd084ac471ed534c' +endif test( 'compress manual file - no dict', shacheck, args: [ zck, 'LICENSE.manual.nodict.fodt.zck', - 'cba69c5fc88fda4352470f3eb0fe5df04e9f1f08c88e0af5a96e53ed3f84526c', + check_sha, '-m', '-s', '