Merge pull request #1217 from facebook/dev

fix poolTest for v1.3.5
Merge pull request #1215 from facebook/dev
2018-06-28 01:55:26 -07:00 · 2018-06-27 16:04:58 -07:00 · 2018-06-27 14:24:54 -07:00 · 2018-06-27 14:16:52 -07:00 · 2018-03-26 15:19:34 -07:00 · 2018-03-26 14:19:52 -07:00
2 changed files with 11 additions and 0 deletions
@@ -19,3 +19,6 @@
 # Windows
 *.bat text eol=crlf
 *.cmd text eol=crlf
+
+# .travis.yml merging
+.travis.yml merge=ours
@@ -37,6 +37,14 @@ matrix:
    - 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
Author	SHA1	Message	Date
Yann ColletandGitHub	90ae50224d	Merge pull request #1217 from facebook/dev fix poolTest for v1.3.5	2018-06-28 01:55:26 -07:00
Yann ColletandGitHub	d1745245e0	Merge pull request #1215 from facebook/dev updating doc/images directory	2018-06-27 16:04:58 -07:00
Yann Collet	d947801569	added travis tests for master and cron jobs	2018-06-27 14:24:54 -07:00
Yann Collet	a2263a93ed	Merge 'dev' to become v1.3.5 .travis.yml comes from `dev` a separate commit will add specifics tests for master	2018-06-27 14:16:52 -07:00
Yann ColletandGitHub	255597502c	Merge pull request #1076 from facebook/dev v1.3.4	2018-03-26 15:19:34 -07:00
Yann Collet	11a3e92883	Merge branch 'dev'	2018-03-26 14:19:52 -07:00
Yann ColletandGitHub	f3a8bd553a	Merge pull request #954 from facebook/dev Release v1.3.3	2017-12-21 10:16:40 +01:00
Yann Collet	ed6e36e809	travis yml : added missing ;	2017-10-18 16:11:14 -07:00
Yann Collet	3423a69f7c	removed comment, in case it would help	2017-10-18 12:37:31 -07:00
Yann Collet	1070bbc5f9	reduce cron test time and check fetch duration	2017-10-18 12:35:17 -07:00
Yann Collet	f4340f46b2	make clean before zstd-lz4 compatibility tests to ensure zstd is rebuilt with lz4 support	2017-10-08 02:41:28 -07:00
Yann Collet	d29bf941b9	added cxxtest to master branch C++ compilation will be tested every night	2017-10-08 00:12:17 -07:00
Yann ColletandGitHub	969e6ef44f	Merge pull request #883 from facebook/dev fixed a small error in decodeCorpus	2017-10-08 00:08:12 -07:00
Yann Collet	2b2f3c6f64	Merge branch 'dev' for v1.3.2	2017-10-06 12:13:27 -07:00
Yann Collet	b0a3ad96d3	reduced OS-X tests as they time out regularly	2017-09-26 19:41:11 -07:00
Yann ColletandGitHub	aecf3b479c	Merge pull request #808 from facebook/dev Zstandard v1.3.1	2017-08-20 12:34:18 -07:00
Yann Collet	b72808a49b	changed zstream test time Used to be 3x5mn, resulting in time out issues (make test) Now set to 3x2mn	2017-07-21 11:45:42 -07:00
Yann ColletandGitHub	fe007ba8bd	Merge pull request #750 from facebook/dev fixed wrong assert() condition	2017-07-05 11:05:17 -07:00
Yann ColletandGitHub	7d30795931	Merge pull request #748 from facebook/dev v1.3.0	2017-07-04 15:09:47 -07:00
Yann ColletandGitHub	da0c157fc4	Merge pull request #686 from facebook/dev v1.2.0	2017-05-04 11:18:24 -07:00
Yann ColletandGitHub	39d0c6cde7	Merge pull request #672 from iburinoc/osxlzma Install liblzma on OS X long test	2017-04-21 11:54:05 -07:00
Sean Purcell	02c44a7257	Install liblzma on OS X long test	2017-04-21 10:42:41 -07:00
Yann ColletandGitHub	585bb51413	Merge pull request #617 from iburinoc/longtest-cmake Add cmakebuild to OS X long tests	2017-03-21 14:03:09 -07:00
Sean Purcell	bb8a7601bc	Add cmakebuild to OS X long tests	2017-03-21 13:46:08 -07:00
Yann Collet	ebf275912a	Merge branch 'dev'	2017-03-15 17:31:40 -07:00
Yann Collet	f2ea8932fc	Merge branch 'dev' keep local .travis.yml	2017-03-15 01:02:10 -07:00
Yann ColletandGitHub	2c2ee2b4b0	Merge pull request #599 from iburinoc/ci-master Update .travis.yml for long tests (master branch only)	2017-03-15 00:50:30 -07:00
Sean Purcell	c4f2490050	Update .travis.yml for long tests (master branch only)	2017-03-10 10:38:23 -08:00
Yann ColletandGitHub	cbc5225d38	Merge pull request #531 from facebook/dev Zstandard v1.1.3	2017-02-06 09:17:34 -08:00
Yann ColletandGitHub	817995bb7a	Merge pull request #484 from facebook/dev v1.1.2	2016-12-15 08:57:04 +01:00
Yann ColletandGitHub	99b6d9f1a3	Merge pull request #438 from facebook/dev v1.1.1	2016-11-01 21:05:51 -07:00
Yann ColletandGitHub	b9edd2f9fb	Merge pull request #394 from facebook/dev Zstandard v1.1.0	2016-09-28 05:16:31 +02:00