From: Sean Purcell <me@seanp.xyz>
Date: Fri, 10 Feb 2017 18:08:55 +0000 (-0800)
Subject: Merge branch 'dev' into multiframe
X-Git-Tag: v1.1.4~1^2~69^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5069b6c2c35a51aabb3a3b3f3e892a5748b0a0a0;p=thirdparty%2Fzstd.git

Merge branch 'dev' into multiframe
---

5069b6c2c35a51aabb3a3b3f3e892a5748b0a0a0
diff --cc tests/Makefile
index d36059ecc,a6f3ada62..f64be1695
--- a/tests/Makefile
+++ b/tests/Makefile
@@@ -230,7 -225,10 +230,10 @@@ zstd-playTests: datage
  	file $(ZSTD)
  	ZSTD="$(QEMU_SYS) $(ZSTD)" ./playTests.sh $(ZSTDRTTEST)
  
- test: test-zstd test-fullbench test-fuzzer test-zstream test-invalidDictionaries test-pool test-legacy
 -test: test-zstd test-fullbench test-fuzzer test-zstream test-invalidDictionaries
++test: test-zstd test-fullbench test-fuzzer test-zstream test-invalidDictionaries test-legacy
+ ifneq ($(QEMU_SYS),qemu-ppc64-static)
+ test: test-pool
+ endif
  
  test32: test-zstd32 test-fullbench32 test-fuzzer32 test-zstream32