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
df688319
"googlemock/src/gmock-internal-utils.cc" did not exist on "bbd6e105e786dd6d4e1fdd6b1467f969121bcca3"
Commit
df688319
authored
Aug 31, 2015
by
Billy Donahue
Browse files
travis googlemock as well
parent
12a8c191
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
7 deletions
+11
-7
.travis.yml
.travis.yml
+1
-0
travis.sh
travis.sh
+10
-7
No files found.
.travis.yml
View file @
df688319
...
@@ -29,6 +29,7 @@ addons:
...
@@ -29,6 +29,7 @@ addons:
-
valgrind
-
valgrind
os
:
os
:
-
linux
-
linux
-
osx
language
:
cpp
language
:
cpp
compiler
:
compiler
:
-
gcc
-
gcc
...
...
travis.sh
View file @
df688319
...
@@ -18,14 +18,17 @@ set -vex
...
@@ -18,14 +18,17 @@ set -vex
env
|
sort
env
|
sort
mkdir
build
mkdir
build
cd
build
cmake ../googletest
make
# Python is not available in Travis for osx.
mkdir
build/googletest
# https://github.com/travis-ci/travis-ci/issues/2320
(
cd
build/googletest
&&
cmake ../../googletest
)
if
[
"
$TRAVIS_OS_NAME
"
!=
"osx"
]
if
[
"
$TRAVIS_OS_NAME
"
!=
"osx"
]
then
then
make
(
cd
build/googletest
&&
make
)
# valgrind --error-exitcode=42 --leak-check=full ./src/test_lib_json/jsoncpp_test
fi
mkdir
build/googlemock
(
cd
build/googlemock
&&
cmake ../../googlemock
)
if
[
"
$TRAVIS_OS_NAME
"
!=
"osx"
]
then
(
cd
build/googlemock
&&
make
)
fi
fi
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