diff --git a/ci/test.sh b/ci/test.sh index 7e558bb..81fac6c 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -92,7 +92,7 @@ test x`./build-$1/test_crasher` = x test -z "`ls /tmp/core* 2>/dev/null`" # make sure there are no compression-related strings -test -z "`strings -a ./build-$1/test_putser | grep -i -e lz -e xz -e deflate -e miniz -e zlib -e zstandard -e zstd -e huff -e rle -e copy -e license -e papaw`" +test -z "`strings -a ./build-$1/test_putser | grep -i -e $1 -e miniz -e zlib -e zstandard -e zstd -e huff -e rle -e copy -e license -e papaw`" # the payload should be extracted to dir_prefix here=`pwd` diff --git a/meson.build b/meson.build index 88d8b32..2c3944a 100644 --- a/meson.build +++ b/meson.build @@ -82,10 +82,10 @@ elif compression == 'zstd' compression_sources += [ custom_target('zstddeclib_obfuscated', input: custom_target('zstddeclib', - input: 'zstd/contrib/single_file_decoder/zstddeclib-in.c', + input: 'zstd/contrib/single_file_libs/zstddeclib-in.c', output: 'zstddeclib.h', command: [ - join_paths(meson.current_source_dir(), 'zstd/contrib/single_file_decoder/combine.sh'), + join_paths(meson.current_source_dir(), 'zstd/contrib/single_file_libs/combine.sh'), '-r', join_paths(meson.current_source_dir(), 'zstd/lib'), '-r', diff --git a/zstd b/zstd index 10f0e69..b706286 160000 --- a/zstd +++ b/zstd @@ -1 +1 @@ -Subproject commit 10f0e6993f9d2f682da6d04aa2385b7d53cbb4ee +Subproject commit b706286adbba780006a47ef92df0ad7a785666b6