From: Yann Collet <cyan@fb.com>
Date: Thu, 2 Aug 2018 18:53:46 +0000 (-0700)
Subject: Merge branch 'dev' into travisTest
X-Git-Tag: v0.0.29~52^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b002eac69aaa6ac044d1ac7ffc04530f66795c31;p=thirdparty%2Fzstd.git

Merge branch 'dev' into travisTest
---

b002eac69aaa6ac044d1ac7ffc04530f66795c31
diff --cc .travis.yml
index b7870b2d7,71b270196..d41a6774d
--- a/.travis.yml
+++ b/.travis.yml
@@@ -27,20 -20,23 +27,30 @@@ matrix
      - env: Cmd='make clang38install && CC=clang-3.8 make clean msan-fuzztest'
      - env: Cmd='make clang38install && CC=clang-3.8 make clean tsan-test-zstream'
  
 -    - env: Cmd='make -C tests test-fuzzer-stackmode'
 -
 -    - env: Cmd='make valgrindinstall && make -C tests clean valgrindTest'
 -
      - env: Cmd='make arminstall && make armfuzz'
++<<<<<<< HEAD
 +    - env: Cmd='make arminstall && make aarch64fuzz'
++=======
+ 
+ # Following test is disabled, as there is a bug in Travis' ld
+ # preventing aarch64 compilation to complete.
+ # > collect2: error: ld terminated with signal 11 [Segmentation fault], core dumped
+ # to be re-enabled in a few commit, as it's possible that a random code change circumvent the ld bug
+ #    - env: Cmd='make arminstall && make aarch64fuzz'
+ 
++>>>>>>> dev
      - env: Cmd='make ppcinstall && make ppcfuzz'
      - env: Cmd='make ppcinstall && make ppc64fuzz'
 -    - env: Cmd='make -j uasanregressiontest && make clean && make -j msanregressiontest'
  
 -    - env: Cmd='make lz4install && make -C tests test-lz4 test-pool && make clean && bash tests/libzstd_partial_builds.sh'
 +    - env: Cmd='make -j uasanregressiontest
 +             && make clean && make -j msanregressiontest'
 +
 +    - env: Cmd='make valgrindinstall && make -C tests clean valgrindTest
 +             && make clean && make -C tests test-fuzzer-stackmode'
 +
 +    - env: Cmd='make lz4install && make -C tests test-lz4
 +             && make clean && make -C tests test-pool
 +             && make clean && bash tests/libzstd_partial_builds.sh'
  
      # tag-specific test
      - if: tag =~ ^v[0-9]\.[0-9]