From b15469203f935f28ced5b95c8f54eb9222e52f5e Mon Sep 17 00:00:00 2001
From: Yann Collet <cyan@fb.com>
Date: Mon, 30 Nov 2020 05:32:43 -0800
Subject: [PATCH 1/2] added tests presumed to break lz4 console detection

---
 .github/workflows/generic-release.yml | 13 +++++++------
 .travis.yml                           |  3 ++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/generic-release.yml b/.github/workflows/generic-release.yml
index d9e7109e..de4a1cb9 100644
--- a/.github/workflows/generic-release.yml
+++ b/.github/workflows/generic-release.yml
@@ -3,17 +3,17 @@ name: generic-release
 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 @@ jobs:
       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 @@ jobs:
     - name: zbuff test
       run: |
         make -C tests test-zbuff
-        
+
   tsan:
     runs-on: ubuntu-16.04
     steps:
@@ -53,7 +53,7 @@ jobs:
         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 @@ jobs:
       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 8498e0ef..226d4c01 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -216,11 +216,12 @@ matrix:
         - 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

From 4b5d7e9ddbd6d85e7a32e28934055ecb1473aa39 Mon Sep 17 00:00:00 2001
From: Yann Collet <cyan@fb.com>
Date: Mon, 30 Nov 2020 06:47:16 -0800
Subject: [PATCH 2/2] fix lz4 test messed by console detection

---
 tests/playTests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/playTests.sh b/tests/playTests.sh
index b0a5ffc6..3f53b6a7 100755
--- a/tests/playTests.sh
+++ b/tests/playTests.sh
@@ -1103,7 +1103,7 @@ if [ $LZ4MODE -eq 1 ]; then
         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