Herbert Thielen
							
						 
					 | 
					
						
						
							
						
						fe97312e24
					 | 
					
						
						
							
							limit processors to use in Travis build to 4
						
						
						
						
						
						
					 | 
					
						2017-09-04 18:56:52 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Herbert Thielen
							
						 
					 | 
					
						
						
							
						
						d96a038e8b
					 | 
					
						
						
							
							set MAKEFLAGS to use multiple processors on Travis CI
						
						
						
						
						
						
					 | 
					
						2017-09-04 18:19:06 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Herbert Thielen
							
						 
					 | 
					
						
						
							
						
						d6c46ebd04
					 | 
					
						
						
							
							Merge branch 'master' into hethi/issue-1175-cmake-build-type
						
						
						
						
						
						
					 | 
					
						2017-08-31 08:47:26 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Herbert Thielen
							
						 
					 | 
					
						
						
							
						
						cc246ecb56
					 | 
					
						
						
							
							use build type set in .travis.yml
						
						
						
						
						
						
						
						The BUILD_TYPE variable of .travis.yml was ignored up to now. 
						
						
					 | 
					
						2017-08-30 11:59:36 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Herbert Thielen
							
						 
					 | 
					
						
						
							
						
						c780e0e2c4
					 | 
					
						
						
							
							Merge branch 'master' into hethi/travis-unused-cmake
						
						
						
						
						
						
					 | 
					
						2017-08-30 10:43:54 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Herbert Thielen
							
						 
					 | 
					
						
						
							
						
						d33861dca6
					 | 
					
						
						
							
							run combined build only
						
						
						
						
						
						
						
						There is no need for separate 'googlemock' and 'googletest' builds,
as the 'googlemock' build includes 'googletest' and it's unit tests. 
						
						
					 | 
					
						2017-08-29 17:41:26 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Herbert Thielen
							
						 
					 | 
					
						
						
							
						
						8364718500
					 | 
					
						
						
							
							remove non-existing gmock_build_samples switch
						
						
						
						
						
						
					 | 
					
						2017-08-29 16:35:41 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Arkadiy Shapkin
							
						 
					 | 
					
						
						
							
						
						43c0ae3375
					 | 
					
						
						
							
							Support running MSVC build on AppVeyour
						
						
						
						
						
						
					 | 
					
						2016-06-27 11:40:27 +03:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								deki
							
						 
					 | 
					
						
						
							
						
						517b3bdc29
					 | 
					
						
						
							
							Add c++11 build to the Travis matrix.
						
						
						
						
						
						
					 | 
					
						2015-09-07 18:23:25 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Billy Donahue
							
						 
					 | 
					
						
						
							
						
						6fc4905021
					 | 
					
						
						
							
							run tests
						
						
						
						
						
						
					 | 
					
						2015-09-01 02:41:55 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Billy Donahue
							
						 
					 | 
					
						
						
							
						
						fbb0b96016
					 | 
					
						
						
							
							restore test running
						
						
						
						
						
						
					 | 
					
						2015-09-01 02:24:48 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Billy Donahue
							
						 
					 | 
					
						
						
							
						
						897fa8e964
					 | 
					
						
						
							
							break out test and mock in travis
						
						
						
						
						
						
					 | 
					
						2015-08-31 10:31:08 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Billy Donahue
							
						 
					 | 
					
						
						
							
						
						fefba42a05
					 | 
					
						
						
							
							break out test and mock in travis
						
						
						
						
						
						
					 | 
					
						2015-08-31 10:29:11 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Billy Donahue
							
						 
					 | 
					
						
						
							
						
						a48c4e5e36
					 | 
					
						
						
							
							cleanup travis.sh
						
						
						
						
						
						
					 | 
					
						2015-08-31 10:21:58 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Billy Donahue
							
						 
					 | 
					
						
						
							
						
						520d30c035
					 | 
					
						
						
							
							travis update
						
						
						
						
						
						
					 | 
					
						2015-08-31 09:54:37 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Billy Donahue
							
						 
					 | 
					
						
						
							
						
						df688319de
					 | 
					
						
						
							
							travis googlemock as well
						
						
						
						
						
						
					 | 
					
						2015-08-31 03:19:21 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Billy Donahue
							
						 
					 | 
					
						
						
							
						
						12a8c19167
					 | 
					
						
						
							
							travis fix
						
						
						
						
						
						
					 | 
					
						2015-08-31 02:58:45 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Billy Donahue
							
						 
					 | 
					
						
						
							
						
						bbb54ef0ee
					 | 
					
						
						
							
							travis config
						
						
						
						
						
						
					 | 
					
						2015-08-31 02:19:39 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |