Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
c4126e04
Commit
c4126e04
authored
Aug 29, 2017
by
Gennadiy Civil
Committed by
GitHub
Aug 29, 2017
Browse files
Merge pull request #1232 from aninf-wo/hethi/travis-reduce-buildjobs
reduce travis buildjobs by 4/12
parents
24ceb4f4
d33861dc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
8 deletions
+4
-8
.travis.yml
.travis.yml
+2
-5
travis.sh
travis.sh
+2
-3
No files found.
.travis.yml
View file @
c4126e04
...
...
@@ -36,11 +36,8 @@ compiler:
script
:
./travis.sh
env
:
matrix
:
-
GTEST_TARGET=googletest 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
-
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
-
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
notifications
:
email
:
false
sudo
:
false
travis.sh
View file @
c4126e04
...
...
@@ -3,13 +3,12 @@ set -evx
env
|
sort
mkdir
build
||
true
mkdir
build/
$GTEST_TARGET
||
true
cd
build/
$GTEST_TARGET
cd
build
cmake
-Dgtest_build_samples
=
ON
\
-Dgmock_build_samples
=
ON
\
-Dgtest_build_tests
=
ON
\
-Dgmock_build_tests
=
ON
\
-DCMAKE_CXX_FLAGS
=
$CXX_FLAGS
\
..
/../
$GTEST_TARGET
..
make
CTEST_OUTPUT_ON_FAILURE
=
1 make
test
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment