From 14aaa5290a674b330f15a1bd154813c7d83794b5 Mon Sep 17 00:00:00 2001
From: Yann Collet <cyan@fb.com>
Date: Thu, 21 May 2020 00:22:52 -0700
Subject: [PATCH 1/3] fixed zbuff test

error introduced in https://github.com/facebook/zstd/blame/3b39ce6b527c5cfe395a187c75b77baf5cc7de02/.travis.yml#L192
---
 .travis.yml                   |  2 +-
 build/meson/tests/meson.build | 15 ---------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 01baee399..ce69723d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -189,7 +189,7 @@ matrix:
     - name: zbuff test
       if: branch = master
       script:
-        - make test-zbuff
+        - make -C tests test-zbuff
 
     - name: Versions Compatibility Test   # 11.5mn
       if: branch = master
diff --git a/build/meson/tests/meson.build b/build/meson/tests/meson.build
index 6b1282def..728dba02d 100644
--- a/build/meson/tests/meson.build
+++ b/build/meson/tests/meson.build
@@ -60,17 +60,6 @@ fuzzer = executable('fuzzer',
   dependencies: libzstd_dep,
   install: false)
 
-zbufftest_sources = [join_paths(zstd_rootdir, 'programs/datagen.c'),
-  join_paths(zstd_rootdir, 'programs/util.c'),
-  join_paths(zstd_rootdir, 'programs/timefn.c'),
-  join_paths(zstd_rootdir, 'tests/zbufftest.c')]
-zbufftest = executable('zbufftest',
-  zbufftest_sources,
-  c_args: ['-Wno-deprecated-declarations'],
-  include_directories: test_includes,
-  dependencies: libzstd_dep,
-  install: false)
-
 zstreamtest_sources = [join_paths(zstd_rootdir, 'programs/datagen.c'),
   join_paths(zstd_rootdir, 'programs/util.c'),
   join_paths(zstd_rootdir, 'programs/timefn.c'),
@@ -193,10 +182,6 @@ if use_zlib
     timeout: 480)
 endif
 
-test('test-zbuff',
-  zbufftest,
-  args: [ZSTREAM_TESTTIME],
-  timeout: 120)
 test('test-zstream-1',
   zstreamtest,
   args: ['-v', ZSTREAM_TESTTIME] + FUZZER_FLAGS,

From a63810e2ac95d3a969a8e6c1a56705bc68206d6d Mon Sep 17 00:00:00 2001
From: Yann Collet <cyan@fb.com>
Date: Thu, 21 May 2020 10:26:40 -0700
Subject: [PATCH 2/3] try to fix PPC64 Qemu tests

---
 .travis.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ce69723d3..ceb0f5a8e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -203,12 +203,6 @@ matrix:
         - CC=clang-3.8 make tsan-test-zstream
         - CC=clang-3.8 make tsan-fuzztest
 
-    - name: Qemu PPC64 + Fuzz test  # ~13mn
-      if: branch = master
-      script:
-        - make ppcinstall
-        - make ppc64fuzz
-
     - name: PPC64LE + Fuzz test  # ~13mn
       if: branch = master
       arch: ppc64le
@@ -216,6 +210,13 @@ matrix:
         - cat /proc/cpuinfo
         - make test
 
+    - name: Qemu PPC64 + Fuzz test  # ~13mn, presumed Big-Endian (?)
+      dist: trusty  # note : PPC64 cross-compilation for Qemu tests seems broken on Xenial
+      if: branch = master
+      script:
+        - make ppcinstall
+        - make ppc64fuzz
+
     # note : we already have aarch64 tests on hardware
     - name: Qemu aarch64 + Fuzz Test (on Xenial)    # ~14mn
       if: branch = master

From 26b21e481f0f5bab1c29a5742580da15e995e33b Mon Sep 17 00:00:00 2001
From: Yann Collet <cyan@fb.com>
Date: Thu, 21 May 2020 14:19:28 -0700
Subject: [PATCH 3/3] fix meson playTests.sh

---
 .travis.yml                   | 2 +-
 build/meson/tests/meson.build | 2 +-
 tests/playTests.sh            | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ceb0f5a8e..a4046287f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -243,7 +243,7 @@ matrix:
         - bash tests/libzstd_partial_builds.sh
 
     # meson dedicated test
-    - name: Xenial (Meson + clang)    # ~8mn
+    - name: Xenial (Meson + clang)    # ~15mn
       if: branch = master
       dist: xenial
       language: cpp
diff --git a/build/meson/tests/meson.build b/build/meson/tests/meson.build
index 728dba02d..0587f9a70 100644
--- a/build/meson/tests/meson.build
+++ b/build/meson/tests/meson.build
@@ -158,7 +158,7 @@ if host_machine_os != os_windows
   test('test-zstd',
     playTests_sh,
     args: ZSTDRTTEST,
-    env: ['ZSTD=' + zstd.full_path()],
+    env: ['ZSTD_BIN=' + zstd.full_path(), 'DATAGEN_BIN=./datagen'],
     depends: [datagen],
     workdir: meson.current_build_dir(),
     timeout: 2800) # Timeout should work on HDD drive
diff --git a/tests/playTests.sh b/tests/playTests.sh
index 4ccf4bd24..f353229be 100755
--- a/tests/playTests.sh
+++ b/tests/playTests.sh
@@ -123,10 +123,10 @@ case "$UNAME" in
   SunOS) DIFF="gdiff" ;;
 esac
 
-println "\nStarting playTests.sh isWindows=$isWindows EXE_PREFIX='$EXE_PREFIX' ZSTD_BIN='$ZSTD_BIN'"
+println "\nStarting playTests.sh isWindows=$isWindows EXE_PREFIX='$EXE_PREFIX' ZSTD_BIN='$ZSTD_BIN' DATAGEN_BIN='$DATAGEN_BIN'"
 
-[ -n "$ZSTD_BIN" ] || die "$ZSTD_BIN variable must be defined!"
-[ -n "$DATAGEN_BIN" ] || die "$DATAGEN_BIN variable must be defined!"
+[ -n "$ZSTD_BIN" ] || die "\$ZSTD_BIN variable must be defined!"
+[ -n "$DATAGEN_BIN" ] || die "\$DATAGEN_BIN variable must be defined!"
 
 if echo hello | zstd -v -T2 2>&1 > $INTOVOID | grep -q 'multi-threading is disabled'
 then