Billy Donahue
de411c3e80
Merge pull request #585 from orgads/warning-fix
...
Fix unused static variable warning on Windows
2015-09-09 09:19:40 -04:00
Orgad Shaneh
904ad180fe
Fix unused static variable warning on Windows
2015-09-09 12:32:57 +03:00
Billy Donahue
b78f858d0c
Include <memory> to use std::unique_ptr.
2015-09-08 02:46:25 -04:00
Billy Donahue
f19b060075
Googlemock has some tuples containing lvalue refs in its unit tests.
...
These tuples are created with make_tuple, which is given temporaries.
The make_tuple is in a function argument list.
A possibly overzealous static_assert in libc++'s std::tuple ctor
is firing in our 'Perform(make_tuple("hi"))' calls, so
we can't use its make_tuple here. Instead we will use
explicitly-constructed tuples constructed from non-temporary strings.
Workaround for llvm bug:
https://llvm.org/bugs/show_bug.cgi?id=20855
An alternative to https://github.com/google/googletest/pull/580 .
2015-09-07 22:32:56 -04:00
Billy Donahue
99166db754
Merge pull request #579 from daus-salar/patch-1
...
FIX add missing blank line between text and table
2015-09-07 21:11:47 -04:00
Billy Donahue
11ae3881eb
Merge pull request #582 from dmircevski/build-c++11
...
Add c++11 build to the Travis matrix.
2015-09-07 20:45:58 -04:00
deki
517b3bdc29
Add c++11 build to the Travis matrix.
2015-09-07 18:23:25 -04:00
Daus Salar
6460005ba4
FIX add missing blank line between text and table
...
The markdown interpreter don't interpret the table otherwise.
2015-09-05 01:12:03 +02:00
Billy Donahue
f570b27e15
Merge pull request #578 from BillyDonahue/upstream_master
...
build once
2015-09-01 02:50:47 -04:00
Billy Donahue
4e8f8cc3e2
build once
2015-09-01 02:50:19 -04:00
Billy Donahue
d6b112ccfd
Merge pull request #577 from BillyDonahue/upstream_master
...
run tests in Travis CI
2015-09-01 02:46:34 -04:00
Billy Donahue
6fc4905021
run tests
2015-09-01 02:41:55 -04:00
Billy Donahue
9986d43dd9
reduce the ci matrix
2015-09-01 02:29:21 -04:00
Billy Donahue
fbb0b96016
restore test running
2015-09-01 02:24:48 -04:00
Billy Donahue
8be1b6b087
Merge branch 'travis'
...
Conflicts:
travis.sh
2015-09-01 02:17:16 -04:00
Billy Donahue
fb6f62d107
run tests in Travis CI
2015-09-01 02:14:45 -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
e5c7bbae18
remove unused valgrind probe
2015-08-31 10:08:44 -04:00
Billy Donahue
520d30c035
travis update
2015-08-31 09:54:37 -04:00
Billy Donahue
b1b7bd3c08
Merge branch 'master' of github.com:google/googletest into travis
2015-08-31 09:46:11 -04:00
Billy Donahue
604bd64d11
Update README.md
2015-08-31 09:43:03 -04:00
Billy Donahue
7443fb92ef
Merge pull request #575 from BillyDonahue/master
...
travis continuous integration
2015-08-31 03:28:40 -04:00
Billy Donahue
be2c677cff
Merge branch 'master' of github.com:BillyDonahue/googletest into travis
2015-08-31 03:21:00 -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
02310e73c6
Merge pull request #1 from BillyDonahue/travis
...
travis config
2015-08-31 02:52:55 -04:00
Billy Donahue
bbb54ef0ee
travis config
2015-08-31 02:19:39 -04:00
Billy Donahue
ff49eded84
Merge pull request #574 from BillyDonahue/undoc
...
Undoc
2015-08-30 12:49:46 -04:00
Billy Donahue
dcec1cede2
Merge branch 'master' into undoc
2015-08-30 12:46:50 -04:00
Billy Donahue
2e10aed6d6
Merge branch 'BillyDonahue-undoc'
2015-08-30 12:45:13 -04:00
Billy Donahue
2eb7748e70
merge
2015-08-30 12:40:37 -04:00
Billy Donahue
da25f9ee21
readme merging
2015-08-30 12:38:08 -04:00
Billy Donahue
23bd6d8a9b
readme merging
2015-08-30 12:36:37 -04:00
Billy Donahue
b55ac7f36f
readme merging
2015-08-30 12:13:33 -04:00
Billy Donahue
24ecc348b9
Merge pull request #571 from srouquette/python3
...
Fix gmock_doctor.py for Python3
2015-08-30 12:09:32 -04:00
Billy Donahue
60c85a40ff
Merge pull request #570 from Codie-Labs/master
...
xcode: project file corrected
2015-08-30 12:06:31 -04:00
Syl
ac830d6b19
Fix gmock_doctor.py for Python3
2015-08-30 09:06:14 +02:00
Nagy Gergő
f5bc23fe4d
Merge pull request #1 from gregory094/master
...
xcode: project file corrected
2015-08-29 22:52:16 +02:00
Gregory Nagy
8ca3ffdbb7
xcode: project file corrected
...
Project file contained the 'README' instead of 'README.md'
that's why the build failed with the fact that it can't
copy this file for its proper location.
Signed-off-by: Gergő Nagy <gergo@getcodie.com>
2015-08-29 22:48:14 +02:00
Billy Donahue
d945d8c000
fix a link
2015-08-27 10:26:17 -04:00
Billy Donahue
64d23926f9
Merge pull request #568 from lacombar/googlemock-build-dir
...
googlemock: change guess of googletest's relative location from ../gtest to ../googletest
2015-08-27 10:24:19 -04:00
Arnaud Lacombe
eff38a7a0f
googlemock: fix unified build
2015-08-26 21:50:38 -07:00
Billy Donahue
3f4e79b999
readme merging
2015-08-26 21:45:10 -04:00
Billy Donahue
4af3c08579
readme merging
2015-08-26 18:29:25 -04:00
Billy Donahue
37b5c297cf
readme merging
2015-08-26 18:28:20 -04:00
Billy Donahue
fba825826a
Update README.md
2015-08-26 10:02:07 -04:00
Billy Donahue
ecf9459561
Merge remote-tracking branch 'google/master'
2015-08-26 00:52:34 -04:00
Billy Donahue
bf5753ac60
Update README.md
2015-08-25 19:17:02 -04:00
