From 14aaa5290a674b330f15a1bd154813c7d83794b5 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Thu, 21 May 2020 00:22:52 -0700 Subject: [PATCH] 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, -- 2.47.2