sharpetronics/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-10-17 00:07:08 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' into dev11

Browse Source
This commit is contained in:
Przemyslaw Skibinski 2017-02-09 09:42:16 +01:00 committed by GitHub
commit 80c1e04c33
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -33,7 +33,7 @@ matrix:
# Standard Ubuntu 12.04 LTS Server Edition 64 bit # Standard Ubuntu 12.04 LTS Server Edition 64 bit
- env: Ubu=12.04 Cmd="make -C programs zstd-small zstd-decompress zstd-compress && make -C programs clean && make -C tests versionsTest" - env: Ubu=12.04 Cmd="make -C programs zstd-small zstd-decompress zstd-compress && make -C programs clean && make -C tests versionsTest test-longmatch"
os: linux os: linux
sudo: required sudo: required

2
tests/Makefile
View File

@ -225,7 +225,7 @@ zstd-playTests: datagen
file $(ZSTD) file $(ZSTD)
ZSTD="$(QEMU_SYS) $(ZSTD)" ./playTests.sh $(ZSTDRTTEST) 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
ifneq ($(QEMU_SYS),qemu-ppc64-static) ifneq ($(QEMU_SYS),qemu-ppc64-static)
test: test-pool test: test-pool
endif endif