From: Przemyslaw Skibinski Date: Mon, 19 Dec 2016 07:20:26 +0000 (+0100) Subject: Merge remote-tracking branch 'refs/remotes/facebook/dev' into v112 X-Git-Tag: v1.1.3^2~44^2^2~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8046b8e721dbf2835b55f41e81f615595f131cf;p=thirdparty%2Fzstd.git Merge remote-tracking branch 'refs/remotes/facebook/dev' into v112 # Conflicts: # appveyor.yml --- f8046b8e721dbf2835b55f41e81f615595f131cf diff --cc appveyor.yml index 5dcbc4ba8,1af9da711..2b46cc804 --- a/appveyor.yml +++ b/appveyor.yml @@@ -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"