Merge pull request #1232 from aninf-wo/hethi/travis-reduce-buildjobs
reduce travis buildjobs by 4/12
This commit is contained in:
		
						commit
						132802e909
					
				@ -36,11 +36,8 @@ compiler:
 | 
				
			|||||||
script: ./travis.sh
 | 
					script: ./travis.sh
 | 
				
			||||||
env:
 | 
					env:
 | 
				
			||||||
  matrix:
 | 
					  matrix:
 | 
				
			||||||
    - GTEST_TARGET=googletest SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE=1
 | 
					    - SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE=1
 | 
				
			||||||
    - GTEST_TARGET=googlemock SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE=1
 | 
					    - SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE=1 CXX_FLAGS=-std=c++11
 | 
				
			||||||
    - GTEST_TARGET=googlemock SHARED_LIB=OFF STATIC_LIB=ON CMAKE_PKG=OFF BUILD_TYPE=debug VERBOSE=1 CXX_FLAGS=-std=c++11
 | 
					 | 
				
			||||||
#    - GTEST_TARGET=googletest SHARED_LIB=ON  STATIC_LIB=ON CMAKE_PKG=ON  BUILD_TYPE=release VERBOSE_MAKE=false
 | 
					 | 
				
			||||||
#    - GTEST_TARGET=googlemock SHARED_LIB=ON  STATIC_LIB=ON CMAKE_PKG=ON  BUILD_TYPE=release VERBOSE_MAKE=false
 | 
					 | 
				
			||||||
notifications:
 | 
					notifications:
 | 
				
			||||||
  email: false
 | 
					  email: false
 | 
				
			||||||
sudo: false
 | 
					sudo: false
 | 
				
			||||||
 | 
				
			|||||||
@ -3,13 +3,12 @@ set -evx
 | 
				
			|||||||
env | sort
 | 
					env | sort
 | 
				
			||||||
 | 
					
 | 
				
			||||||
mkdir build || true
 | 
					mkdir build || true
 | 
				
			||||||
mkdir build/$GTEST_TARGET || true
 | 
					cd build
 | 
				
			||||||
cd build/$GTEST_TARGET
 | 
					 | 
				
			||||||
cmake -Dgtest_build_samples=ON \
 | 
					cmake -Dgtest_build_samples=ON \
 | 
				
			||||||
      -Dgmock_build_samples=ON \
 | 
					      -Dgmock_build_samples=ON \
 | 
				
			||||||
      -Dgtest_build_tests=ON \
 | 
					      -Dgtest_build_tests=ON \
 | 
				
			||||||
      -Dgmock_build_tests=ON \
 | 
					      -Dgmock_build_tests=ON \
 | 
				
			||||||
      -DCMAKE_CXX_FLAGS=$CXX_FLAGS \
 | 
					      -DCMAKE_CXX_FLAGS=$CXX_FLAGS \
 | 
				
			||||||
      ../../$GTEST_TARGET
 | 
					      ..
 | 
				
			||||||
make
 | 
					make
 | 
				
			||||||
CTEST_OUTPUT_ON_FAILURE=1 make test
 | 
					CTEST_OUTPUT_ON_FAILURE=1 make test
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user