From 4602e530215a71957669da17c7d7e74ec30fa07d Mon Sep 17 00:00:00 2001
From: inikep <inikep@gmail.com>
Date: Fri, 23 Sep 2016 10:43:37 +0200
Subject: [PATCH] added valgrindTest for zlibWrapper

---
 .travis.yml          | 75 ++------------------------------------------
 Makefile             |  1 -
 zlibWrapper/Makefile |  8 +++++
 3 files changed, 10 insertions(+), 74 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 80cae76f..1bfbb631 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,88 +3,17 @@ compiler: gcc
 matrix:
   fast_finish: true
   include:
-    # OS X Mavericks
-    - os: osx
-      env: PLATFORM="OS X Mavericks" CMD="make gnu90test && make clean && make test && make clean && make travis-install"
-    # Container-based Ubuntu 12.04 LTS Server Edition 64 bit (doesn't support 32-bit includes)
-    - os: linux
-      sudo: false
-      env: PLATFORM="Ubuntu 12.04 container" CMD="make test && make clean && make travis-install"
-    - os: linux
-      sudo: false
-      language: cpp
-      install:
-        - export CXX="g++-4.8" CC="gcc-4.8"
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - gcc-4.8
-            - g++-4.8
-      env: PLATFORM="Ubuntu 12.04 container" CMD="make -C tests test-zstd_nolegacy && make clean && make zlibwrapper && make clean && make cmaketest && make clean && make -C contrib/pzstd pzstd && make -C contrib/pzstd googletest && make -C contrib/pzstd test && make -C contrib/pzstd clean"
-    - os: linux
-      sudo: false
-      env: PLATFORM="Ubuntu 12.04 container" CMD="make usan"
-    - os: linux
-      sudo: false
-      env: PLATFORM="Ubuntu 12.04 container" CMD="make asan"
-    # Standard Ubuntu 12.04 LTS Server Edition 64 bit
     - os: linux
       sudo: required
-      env: PLATFORM="Ubuntu 12.04" CMD="make armtest"
-      addons:
-        apt:
-          packages:
-            - gcc-arm-linux-gnueabi
-            - libc6-dev-armel-cross
-            - linux-libc-dev-armel-cross
-            - binfmt-support
-            - qemu
-            - qemu-user-static
-    - os: linux
-      sudo: required
-      env: PLATFORM="Ubuntu 12.04" CMD="make -C tests versionsTest"
-    - os: linux
-      sudo: required
-      env: PLATFORM="Ubuntu 12.04" CMD="make asan32"
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - libc6-dev-i386
-            - gcc-multilib
-    - os: linux
-      sudo: required
-      env: PLATFORM="Ubuntu 12.04" CMD="make -C tests valgrindTest"
+      env: PLATFORM="Ubuntu 12.04" CMD="make -C zlibWrapper test valgrindTest"
       addons:
         apt:
           packages:
             - valgrind
-    # Ubuntu 14.04 LTS Server Edition 64 bit
     - os: linux
       dist: trusty
       sudo: required
-      env: PLATFORM="Ubuntu 14.04" CMD="make gpptest && make clean && make gnu90test && make clean && make c99test && make clean && make gnu99test && make clean && make clangtest"
-      addons:
-        apt:
-          packages:
-            - libc6-dev-i386
-            - g++-multilib 
-    - os: linux
-      dist: trusty
-      sudo: required
-      env: PLATFORM="Ubuntu 14.04" CMD="make -C tests test32"
-      addons:
-        apt:
-          packages:
-            - libc6-dev-i386
-            - gcc-multilib
-    - os: linux
-      dist: trusty
-      sudo: required
-      env: PLATFORM="Ubuntu 14.04" CMD="make zlibwrapper && make clean && make gcc5test && make clean && make gcc6test && sudo apt-get install -y -q qemu-system-ppc binfmt-support qemu-user-static gcc-powerpc-linux-gnu && make clean && make ppctest"
+      env: PLATFORM="Ubuntu 14.04" CMD="make zlibwrapper"
       addons:
         apt:
           sources:
diff --git a/Makefile b/Makefile
index d3ab6e02..f355891a 100644
--- a/Makefile
+++ b/Makefile
@@ -34,7 +34,6 @@ zstd:
 	cp $(PRGDIR)/zstd .
 
 zlibwrapper:
-	$(MAKE) -C $(ZSTDDIR) all
 	$(MAKE) -C $(ZWRAPDIR) test test_zstd
 
 test:
diff --git a/zlibWrapper/Makefile b/zlibWrapper/Makefile
index 3d6131aa..e83c5bc0 100644
--- a/zlibWrapper/Makefile
+++ b/zlibWrapper/Makefile
@@ -43,6 +43,14 @@ test_zstd: example_zstd fitblk_zstd zwrapbench
 	./fitblk_zstd 40960 <../zstd_compression_format.md
 	./zwrapbench -qb1e5 ../zstd_compression_format.md
 
+valgrindTest: VALGRIND = valgrind --leak-check=full --error-exitcode=1
+valgrindTest: example_zstd fitblk_zstd zwrapbench
+	@echo "\n ---- valgrind tests ----"
+	$(VALGRIND) ./example_zstd
+	$(VALGRIND) ./fitblk_zstd 10240 <../zstd_compression_format.md
+	$(VALGRIND) ./fitblk_zstd 40960 <../zstd_compression_format.md
+	$(VALGRIND) ./zwrapbench -qb1e5 ../zstd_compression_format.md
+
 .c.o:
 	$(CC) $(CFLAGS) -c -o $@ $<