Merge pull request #1354 from facebook/dev
Zstandard v1.3.6
diff --git a/.gitattributes b/.gitattributes
index 6212bd4..9eb12c0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -19,3 +19,6 @@
# Windows
*.bat text eol=crlf
*.cmd text eol=crlf
+
+# .travis.yml merging
+.travis.yml merge=ours
diff --git a/.travis.yml b/.travis.yml
index a61b828..284e8a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,6 +47,14 @@
- if: tag =~ ^v[0-9]\.[0-9]
env: Cmd='make -C tests checkTag && tests/checkTag $TRAVIS_BRANCH'
+ # additional tests for master branch and cron job
+ - env: Cmd="make test"
+ os: osx
+ - env: Cmd='make clang38install && CC=clang-3.8 make clean tsan-test-zstream'
+ - env: Cmd='make cxxtest && make clean && make gnu90build && make clean && make cmakebuild && make clean && make travis-install'
+ - env: Cmd='make gpp6install valgrindinstall && make -C zlibWrapper test && make -C zlibWrapper valgrindTest'
+
+
git:
depth: 1
