From fb6901b2c0fc4f67954e4f67db4ec34aaf0c4866 Mon Sep 17 00:00:00 2001 From: Lzu Tao Date: Fri, 12 Apr 2019 21:28:17 +0700 Subject: [PATCH 1/3] tests: Add missing header timefn.h --- tests/zbufftest.c | 1 + tests/zstreamtest.c | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/zbufftest.c b/tests/zbufftest.c index 9b6f7bad6..8cbde3f4f 100644 --- a/tests/zbufftest.c +++ b/tests/zbufftest.c @@ -25,6 +25,7 @@ #include /* free */ #include /* fgets, sscanf */ #include /* strcmp */ +#include "timefn.h" /* UTIL_time_t */ #include "mem.h" #define ZSTD_STATIC_LINKING_ONLY /* ZSTD_maxCLevel */ #include "zstd.h" /* ZSTD_compressBound */ diff --git a/tests/zstreamtest.c b/tests/zstreamtest.c index e6f69d78b..f07477ae5 100644 --- a/tests/zstreamtest.c +++ b/tests/zstreamtest.c @@ -26,6 +26,7 @@ #include /* fgets, sscanf */ #include /* strcmp */ #include /* assert */ +#include "timefn.h" /* UTIL_time_t, UTIL_getTime */ #include "mem.h" #define ZSTD_STATIC_LINKING_ONLY /* ZSTD_maxCLevel, ZSTD_customMem, ZSTD_getDictID_fromFrame */ #include "zstd.h" /* ZSTD_compressBound */ From 6c9b023f3e30d59b8c7f4f05621e69113e98bc34 Mon Sep 17 00:00:00 2001 From: Lzu Tao Date: Fri, 12 Apr 2019 21:28:36 +0700 Subject: [PATCH 2/3] meson: Fix build --- build/meson/programs/meson.build | 2 ++ build/meson/tests/meson.build | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/build/meson/programs/meson.build b/build/meson/programs/meson.build index d91dd3368..363818f9d 100644 --- a/build/meson/programs/meson.build +++ b/build/meson/programs/meson.build @@ -12,6 +12,7 @@ zstd_rootdir = '../../..' zstd_programs_sources = [join_paths(zstd_rootdir, 'programs/zstdcli.c'), join_paths(zstd_rootdir, 'programs/util.c'), + join_paths(zstd_rootdir, 'programs/timefn.c'), join_paths(zstd_rootdir, 'programs/fileio.c'), join_paths(zstd_rootdir, 'programs/benchfn.c'), join_paths(zstd_rootdir, 'programs/benchzstd.c'), @@ -63,6 +64,7 @@ zstd = executable('zstd', install: true) zstd_frugal_sources = [join_paths(zstd_rootdir, 'programs/zstdcli.c'), + join_paths(zstd_rootdir, 'programs/timefn.c'), join_paths(zstd_rootdir, 'programs/util.c'), join_paths(zstd_rootdir, 'programs/fileio.c')] diff --git a/build/meson/tests/meson.build b/build/meson/tests/meson.build index aa9cd86f4..fd813ea88 100644 --- a/build/meson/tests/meson.build +++ b/build/meson/tests/meson.build @@ -40,6 +40,7 @@ datagen = executable('datagen', fullbench_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, 'programs/benchfn.c'), join_paths(zstd_rootdir, 'programs/benchzstd.c'), join_paths(zstd_rootdir, 'tests/fullbench.c')] @@ -51,6 +52,7 @@ fullbench = executable('fullbench', fuzzer_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/fuzzer.c')] fuzzer = executable('fuzzer', fuzzer_sources, @@ -60,6 +62,7 @@ fuzzer = executable('fuzzer', 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, @@ -70,6 +73,7 @@ zbufftest = executable('zbufftest', zstreamtest_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/seqgen.c'), join_paths(zstd_rootdir, 'tests/zstreamtest.c')] zstreamtest = executable('zstreamtest', @@ -79,6 +83,7 @@ zstreamtest = executable('zstreamtest', install: false) paramgrill_sources = [join_paths(zstd_rootdir, 'programs/benchfn.c'), + join_paths(zstd_rootdir, 'programs/timefn.c'), join_paths(zstd_rootdir, 'programs/benchzstd.c'), join_paths(zstd_rootdir, 'programs/datagen.c'), join_paths(zstd_rootdir, 'programs/util.c'), @@ -116,6 +121,7 @@ legacy = executable('legacy', install: false) decodecorpus_sources = [join_paths(zstd_rootdir, 'programs/util.c'), + join_paths(zstd_rootdir, 'programs/timefn.c'), join_paths(zstd_rootdir, 'tests/decodecorpus.c')] decodecorpus = executable('decodecorpus', decodecorpus_sources, @@ -132,6 +138,7 @@ symbols = executable('symbols', install: false) poolTests_sources = [join_paths(zstd_rootdir, 'programs/util.c'), + join_paths(zstd_rootdir, 'programs/timefn.c'), join_paths(zstd_rootdir, 'tests/poolTests.c'), join_paths(zstd_rootdir, 'lib/common/pool.c'), join_paths(zstd_rootdir, 'lib/common/threading.c'), From e31e7ca9ed56c6a28e6f038afdf58c25ed5de8a1 Mon Sep 17 00:00:00 2001 From: Lzu Tao Date: Fri, 12 Apr 2019 23:43:34 +0700 Subject: [PATCH 3/3] travis: Make Mesonbuild non-optional --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b3a654378..ad2b4292a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -178,7 +178,7 @@ matrix: # meson dedicated test - name: Xenial (Meson + clang) - env: ALLOW_FAILURES=true + # env: ALLOW_FAILURES=true dist: xenial language: cpp compiler: clang