Merge pull request #2404 from facebook/lz4check
fix lz4 compatibility test broken in docker
diff --git a/.github/workflows/generic-release.yml b/.github/workflows/generic-release.yml
index d9e7109..de4a1cb 100644
--- a/.github/workflows/generic-release.yml
+++ b/.github/workflows/generic-release.yml
@@ -3,17 +3,17 @@
on:
pull_request:
# This will eventually only be for pushes to master
- # but for dogfooding purposes, I'm running it even
+ # but for dogfooding purposes, I'm running it even
# on dev pushes
branches: [ dev, master, actionsTest ]
jobs:
# missing jobs
- #
+ #
# ppc64le + fuzz test
# Qemu PPC64 + Fuzz test
# Qemu aarch64 + Fuzz Test (on Xenial)
- # versions comp
+ # versions comp
# meson test
osx:
@@ -24,7 +24,7 @@
run: |
make test
# make -c lib all (need to fix. not working right now)
-
+
zbuff:
runs-on: ubuntu-16.04
steps:
@@ -32,7 +32,7 @@
- name: zbuff test
run: |
make -C tests test-zbuff
-
+
tsan:
runs-on: ubuntu-16.04
steps:
@@ -53,7 +53,7 @@
make gpp6install valgrindinstall
make -C zlibWrapper test
make -C zlibWrapper valgrindTest
-
+
lz4-threadpool-partial-libs:
runs-on: ubuntu-16.04
steps:
@@ -62,6 +62,7 @@
run: |
make lz4install
make -C tests test-lz4
+ make check < /dev/null | tee # mess with lz4 console detection
make clean
make -C tests test-pool
make clean
diff --git a/.travis.yml b/.travis.yml
index 8498e0e..226d4c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -216,11 +216,12 @@
- make -C zlibWrapper test
- 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
script:
- make lz4install
- make -C tests test-lz4
+ - make check < /dev/null | tee # mess with lz4 console detection
- make clean
- make -C tests test-pool
- make clean
diff --git a/tests/playTests.sh b/tests/playTests.sh
index b0a5ffc..3f53b6a 100755
--- a/tests/playTests.sh
+++ b/tests/playTests.sh
@@ -1103,7 +1103,7 @@
datagen > tmp
zstd --format=lz4 -f tmp
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
rm tmp*
else