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

diff --cc .travis.yml
index 566f3aa4e2bae5602e7df6447a51d7f6f7477585,1fd7e6aadd5639b554e81da8e4ed658705f9621c..b7870b2d7d501e4963bb43f9b12f14c7abe4eb08
--- 1/.travis.yml
--- 2/.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'