]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Merge pull request #860 from felixhandte/zstd-lz4-support-tests
authorYann Collet <Cyan4973@users.noreply.github.com>
Sat, 30 Sep 2017 05:32:54 +0000 (22:32 -0700)
committerGitHub <noreply@github.com>
Sat, 30 Sep 2017 05:32:54 +0000 (22:32 -0700)
Add Default LZ4 Support When Available

1  2 
.travis.yml
Makefile
programs/Makefile
programs/fileio.c
programs/zstd.1
programs/zstd.1.md
programs/zstdcli.c
tests/Makefile

diff --cc .travis.yml
index 67da248d93026908805bd156e102b8a32e6b8f95,26aeab90ce47002563c04fad6d9f326879a6adaf..48d9ac3a672c9807fcccdb3cc81259affb73a47d
@@@ -21,9 -21,9 +21,11 @@@ matrix
      - env: Cmd='make arminstall && make aarch64fuzz'
      - env: Cmd='make ppcinstall && make ppcfuzz'
      - env: Cmd='make ppcinstall && make ppc64fuzz'
 +    - env: Cmd='make -j uasanregressiontest'
 +    - env: Cmd='make -j msanregressiontest'
  
+     - env: Cmd='make lz4install && make -C tests test-lz4'
  git:
    depth: 1
  
diff --cc Makefile
Simple merge
Simple merge
Simple merge
diff --cc programs/zstd.1
Simple merge
Simple merge
Simple merge
diff --cc tests/Makefile
Simple merge