From 5705d9f25a48c6af18d7e2b8430d99b64540c90d Mon Sep 17 00:00:00 2001 From: "W. Felix Handte" Date: Thu, 21 Sep 2017 17:30:43 -0700 Subject: [PATCH] Add basic tests for the lz4 integration --- .travis.yml | 2 ++ Makefile | 5 +++++ tests/Makefile | 22 ++++++++++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/.travis.yml b/.travis.yml index a52d57af3..26aeab90c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,8 @@ matrix: - env: Cmd='make ppcinstall && make ppcfuzz' - env: Cmd='make ppcinstall && make ppc64fuzz' + - env: Cmd='make lz4install && make -C tests test-lz4' + git: depth: 1 diff --git a/Makefile b/Makefile index e8bdcea33..13e825021 100644 --- a/Makefile +++ b/Makefile @@ -97,6 +97,7 @@ clean: @$(MAKE) -C examples/ $@ > $(VOID) @$(MAKE) -C contrib/gen_html $@ > $(VOID) @$(RM) zstd$(EXT) zstdmt$(EXT) tmp* + @$(RM) -r lz4 @echo Cleaning completed #------------------------------------------------------------------------------ @@ -274,6 +275,10 @@ gpp6install: apt-add-repo clang38install: APT_PACKAGES="clang-3.8" $(MAKE) apt-install +# Ubuntu 14.04 ships a too-old lz4 +lz4install: + [ -e lz4 ] || git clone https://github.com/lz4/lz4 && sudo $(MAKE) -C lz4 install + endif diff --git a/tests/Makefile b/tests/Makefile index 2746c1392..f30398c06 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -374,4 +374,26 @@ test-decodecorpus-cli: decodecorpus test-pool: poolTests $(QEMU_SYS) ./poolTests +test-lz4: ZSTD = LD_LIBRARY_PATH=/usr/local/lib $(PRGDIR)/zstd +test-lz4: zstd decodecorpus + ./decodecorpus -ptmp + # lz4 -> zstd + lz4 < tmp | \ + $(ZSTD) -d | \ + cmp - tmp + # zstd -> lz4 + $(ZSTD) --format=lz4 < tmp | \ + lz4 -d | \ + cmp - tmp + # zstd -> zstd + $(ZSTD) --format=lz4 < tmp | \ + $(ZSTD) -d | \ + cmp - tmp + # zstd -> zstd + $(ZSTD) < tmp | \ + $(ZSTD) -d | \ + cmp - tmp + + rm tmp + endif