Merge pull request #2404 from facebook/lz4check

fix lz4 compatibility test broken in docker
This commit is contained in:
Yann Collet 2020-11-30 10:38:08 -08:00 committed by GitHub
commit 9939ccecc4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 8 deletions

View File

@ -62,6 +62,7 @@ jobs:
run: | run: |
make lz4install make lz4install
make -C tests test-lz4 make -C tests test-lz4
make check < /dev/null | tee # mess with lz4 console detection
make clean make clean
make -C tests test-pool make -C tests test-pool
make clean make clean

View File

@ -216,11 +216,12 @@ matrix:
- make -C zlibWrapper test - make -C zlibWrapper test
- make -C zlibWrapper valgrindTest - make -C zlibWrapper valgrindTest
- name: LZ4, thread pool, and partial libs tests # ~2mn - name: LZ4, thread pool, and partial libs tests # ~4mn
if: branch = master if: branch = master
script: script:
- make lz4install - make lz4install
- make -C tests test-lz4 - make -C tests test-lz4
- make check < /dev/null | tee # mess with lz4 console detection
- make clean - make clean
- make -C tests test-pool - make -C tests test-pool
- make clean - make clean

View File

@ -1103,7 +1103,7 @@ if [ $LZ4MODE -eq 1 ]; then
datagen > tmp datagen > tmp
zstd --format=lz4 -f tmp zstd --format=lz4 -f tmp
lz4 -t -v tmp.lz4 lz4 -t -v tmp.lz4
lz4 -f tmp lz4 -f -m tmp # ensure result is sent into tmp.lz4, not stdout
zstd -d -f -v tmp.lz4 zstd -d -f -v tmp.lz4
rm tmp* rm tmp*
else else