From: Yann Collet <cyan@fb.com>
Date: Thu, 21 May 2020 07:22:52 +0000 (-0700)
Subject: fixed zbuff test
X-Git-Tag: v1.4.5^2~3^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2155%2Fhead;p=thirdparty%2Fzstd.git

fixed zbuff test

error introduced in https://github.com/facebook/zstd/blame/3b39ce6b527c5cfe395a187c75b77baf5cc7de02/.travis.yml#L192
---

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,