From: Yann Collet <cyan@fb.com>
Date: Fri, 1 Sep 2017 00:00:16 +0000 (-0700)
Subject: Merge branch 'modTests' into dev
X-Git-Tag: fuzz-corpora2~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7818fc67647fe414d115146f7ec9832d53febc2;p=thirdparty%2Fzstd.git

Merge branch 'modTests' into dev

fixed conflict
---

c7818fc67647fe414d115146f7ec9832d53febc2
diff --cc appveyor.yml
index 99fa834b4,91f117952..0f9142b47
--- a/appveyor.yml
+++ b/appveyor.yml
@@@ -9,13 -9,13 +9,13 @@@
      - COMPILER: "gcc"
        HOST:     "mingw"
        PLATFORM: "x64"
-       SCRIPT:   "make allarch MOREFLAGS=-static && make -C tests test-symbols fullbench-dll fullbench-lib"
 -      SCRIPT:   "make allzstd && make -C tests test-symbols fullbench-dll fullbench-lib"
++      SCRIPT:   "make allzstd MOREFLAGS=-static && make -C tests test-symbols fullbench-dll fullbench-lib"
        ARTIFACT: "true"
        BUILD:    "true"
      - COMPILER: "gcc"
        HOST:     "mingw"
        PLATFORM: "x86"
-       SCRIPT:   "make allarch MOREFLAGS=-static"
 -      SCRIPT:   "make allzstd"
++      SCRIPT:   "make allzstd MOREFLAGS=-static"
        ARTIFACT: "true"
        BUILD:    "true"
      - COMPILER: "clang"