]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Merge remote-tracking branch 'refs/remotes/facebook/dev' into v112
authorPrzemyslaw Skibinski <inikep@gmail.com>
Mon, 19 Dec 2016 07:20:26 +0000 (08:20 +0100)
committerPrzemyslaw Skibinski <inikep@gmail.com>
Mon, 19 Dec 2016 07:20:26 +0000 (08:20 +0100)
# Conflicts:
# appveyor.yml

1  2 
appveyor.yml
programs/bench.c
programs/dibio.c
programs/fileio.c
programs/zstdcli.c

diff --cc appveyor.yml
index 5dcbc4ba88f77339a08df5d85940de139da5a387,1af9da711b37bc5979faeb5a39e7068ebb2a2308..2b46cc804d3d08c45841cd7c59790871e85447fd
@@@ -2,10 -2,10 +2,10 @@@ version: 1.0.{build
  environment:
    matrix:
    - COMPILER: "gcc"
-     MAKE_PARAMS: '"make test && make lib && make -C tests fullbench-dll fullbench-lib"'
 -    MAKE_PARAMS: "test"
++    MAKE_PARAMS: '"make test && make lib && make -C tests test-symbols fullbench-dll fullbench-lib"'
      PLATFORM: "mingw64"
    - COMPILER: "gcc"
 -    MAKE_PARAMS: "test"
 +    MAKE_PARAMS: "make test"
      PLATFORM: "mingw32"
    - COMPILER: "visual"
      CONFIGURATION: "Debug"
Simple merge
Simple merge
Simple merge
Simple merge