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

Merge branch 'travisTest' of github.com:facebook/zstd into travisTest
---

064b8e6785ce14e390b89e70bb45f2e1381025c9
diff --cc .travis.yml
index 566f3aa4e,1fd7e6aad..b7870b2d7
--- a/.travis.yml
+++ b/.travis.yml
@@@ -10,8 -10,8 +10,13 @@@ addons
  matrix:
    include:
      # Ubuntu 14.04
++<<<<<<< HEAD
 +    - env: Cmd='make gcc6install && CC=gcc-6 make -j all
 +             && make clean && CC=gcc-6 make clean uasan-test-zstd'
++=======
+     - env: Cmd='make test'
+     - env: Cmd='make gcc6install && CC=gcc-6 make -j all && make clean && CC=gcc-6 make clean uasan-test-zstd </dev/null' # also test when stdin is not a tty
++>>>>>>> 0840d02ecf74eae656e0df0d900000d9b0154cde
      - env: Cmd='make gcc6install libc6install && CC=gcc-6 make clean uasan-test-zstd32'
      - env: Cmd='make gcc7install && CC=gcc-7 make clean uasan-test-zstd'
      - env: Cmd='make clang38install && CC=clang-3.8 make clean msan-test-zstd'