From: Przemyslaw Skibinski <inikep@gmail.com>
Date: Thu, 9 Feb 2017 08:42:16 +0000 (+0100)
Subject: Merge branch 'dev' into dev11
X-Git-Tag: v1.1.4~1^2~75^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80c1e04c338228899e2e9311de729c68a6588102;p=thirdparty%2Fzstd.git

Merge branch 'dev' into dev11
---

80c1e04c338228899e2e9311de729c68a6588102
diff --cc tests/Makefile
index 07069d3ac,452f080ea..a6f3ada62
--- a/tests/Makefile
+++ b/tests/Makefile
@@@ -225,10 -225,7 +225,10 @@@ zstd-playTests: datage
  	file $(ZSTD)
  	ZSTD="$(QEMU_SYS) $(ZSTD)" ./playTests.sh $(ZSTDRTTEST)
  
- test: test-zstd test-fullbench test-fuzzer test-zstream test-longmatch test-invalidDictionaries
 -test: test-zstd test-fullbench test-fuzzer test-zstream test-invalidDictionaries test-pool
++test: test-zstd test-fullbench test-fuzzer test-zstream test-invalidDictionaries
 +ifneq ($(QEMU_SYS),qemu-ppc64-static)
 +test: test-pool
 +endif
  
  test32: test-zstd32 test-fullbench32 test-fuzzer32 test-zstream32