From: Sean Purcell <me@seanp.xyz>
Date: Thu, 9 Feb 2017 19:54:22 +0000 (-0800)
Subject: Merge branch 'dev' into multiframe
X-Git-Tag: v1.1.4~1^2~69^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=478d7174e53dec404c6e35b58bc8d9af046f1bbb;p=thirdparty%2Fzstd.git

Merge branch 'dev' into multiframe
---

478d7174e53dec404c6e35b58bc8d9af046f1bbb
diff --cc tests/Makefile
index 5c966534c,452f080ea..d36059ecc
--- a/tests/Makefile
+++ b/tests/Makefile
@@@ -230,7 -225,7 +230,7 @@@ 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-pool test-legacy
 -test: test-zstd test-fullbench test-fuzzer test-zstream test-invalidDictionaries test-pool
++test: test-zstd test-fullbench test-fuzzer test-zstream test-invalidDictionaries test-pool test-legacy
  
  test32: test-zstd32 test-fullbench32 test-fuzzer32 test-zstream32