eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,023 Commits 13 Branches 14 Tags
Commit Graph

3023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gennadiy Civil
7f11b9ffb5
Merge pull request #1779 from google/9A681768AABE08D1EFA5CA77528236A4 
Googletest export
 2018-08-23 20:00:01 -04:00
misterg
87494afca7 Googletest export 
Remove unneeded check for NULL.
Note: this started as OSS PR https://github.com/google/googletest/pull/967 but changed
PiperOrigin-RevId: 209819732
 2018-08-23 16:03:46 -04:00
srz_zumix
9dae300121 Googletest export 
Internal Change

PiperOrigin-RevId: 209498445
 2018-08-23 16:03:39 -04:00
srz_zumix
dc72f7c3b4 Googletest export 
Internal Change

PiperOrigin-RevId: 209471987
 2018-08-23 16:03:31 -04:00
Jacob Schloss
6de39826aa
Merge branch 'master' into issue_1735 2018-08-22 12:55:43 -07:00
Jacob Schloss
6e79801645 It seems like CMAKE_CXX_FLAGS is getting double appended when building as a nested cmake project, 
which breaks my build as gcc does not allow -specs=nosys.specs to be called multiple times.

Removing this fixes it and seems to keep the same compile options, just removing the duplicate definition.
 2018-08-22 11:17:32 -07:00
Gennadiy Civil
1d9a1912e7
Merge pull request #1338 from stefanosoffia/master 
Install CMake export files
 2018-08-22 13:05:06 -04:00
Stefano Soffia
aff0379441 Install CMake export files 
Rework of the closed pull request #768
 2018-08-22 17:27:11 +02:00
Gennadiy Civil
880896c6f4
Merge pull request #1682 from dakotahawkins/improve-exported-targets 
Improve CMake exported targets
 2018-08-21 13:51:42 -04:00
Dakota Hawkins
759ef7c4e9
Improve CMake exported targets. 
I _think_ this represents some of the "best practices" for exporting
targets. They'll be available in a `googletest::` namespace (e.g.
`googletest::gmock`) with non-namespaced `ALIAS` targets.

- Added GOOGLETEST_VERSION variable
- Use `CMakePackageConfigHelpers`, bump minimum CMake version to 2.8.8

Signed-off-by: Dakota Hawkins <dakotahawkins@gmail.com>
 2018-08-21 13:02:09 -04:00
Gennadiy Civil
b88511ef64
Merge pull request #1194 from joshbodily/josh/fix_scoped_class2 
Fix scoped enum not working in gmock-gen.py
 2018-08-21 10:32:21 -04:00
Gennadiy Civil
a6e7ba27c7
Merge branch 'master' into josh/fix_scoped_class2 2018-08-20 16:15:04 -04:00
Gennadiy Civil
735bd75f69
Update CONTRIBUTING.md 2018-08-20 16:08:33 -04:00
Gennadiy Civil
ecd844de90
Merge pull request #1759 from gennadiycivil/master 
merge
 2018-08-20 15:42:27 -04:00
Gennadiy Civil
6c8c74ecee merge 2018-08-20 14:57:53 -04:00
misterg
df428ec118 googletest export 
- 209457654 Import of OSS PR, https://github.com/google/googletest/pu... by misterg <misterg@google.com>

PiperOrigin-RevId: 209457654
 2018-08-20 14:50:48 -04:00
misterg
5891bb5307 googletest export 
- 209457486 Import of OSS PR, https://github.com/google/googletest/pu... by misterg <misterg@google.com>

PiperOrigin-RevId: 209457486
 2018-08-20 14:50:41 -04:00
Gennadiy Civil
cfc0d5fb0c Testing, adding a few line to sample4 2018-08-20 14:17:38 -04:00
Gennadiy Civil
72a8105966 Testing, adding to sample4 unittest 2018-08-20 14:10:58 -04:00
Gennadiy Civil
9404c5ae04
Merge pull request #1754 from vkotovv/docs-advanced-broken-links 
docs: fixed broken references to sections in Advanced guide
 2018-08-20 11:04:11 -04:00
Gennadiy Civil
49e6a9b771
Merge pull request #1120 from tanzislam/fix_death_test_child_mingw_wer_issue1116 
Allow death test child to bypass Windows Error Reporting under MinGW
 2018-08-20 10:50:41 -04:00
Gennadiy Civil
c1230dea6b
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-08-20 10:21:32 -04:00
Vadim Kotov
ddc618ab31
docs: fix more broken links to sections in Advanced guide 2018-08-20 16:20:14 +03:00
Vadim Kotov
02c4f1af9d
docs: fixed broken references to sections in Advanced guide 2018-08-20 15:31:55 +03:00
Gennadiy Civil
1778f2091e
Merge pull request #1347 from Burgch/fix-argc 
Fix value pointed to by `_NSGetArgc()` on macOS.
 2018-08-19 14:16:03 -04:00
Gennadiy Civil
97274b1e94
Merge branch 'master' into fix-argc 2018-08-19 14:03:30 -04:00
Gennadiy Civil
a946f7db03
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-08-18 13:15:35 -04:00
Gennadiy Civil
d1c1aac781
Merge pull request #1612 from wkaluza/fix-msvc-d9025-warning 
Remove default /EHsc compiler flag
 2018-08-17 23:27:19 -04:00
Gennadiy Civil
85b572394b
Merge pull request #1652 from medithe/patch-1 
Cast the tr1::tuple_element template parameter to int
 2018-08-17 23:05:00 -04:00
Tanzinul Islam
cb69e686df Merge branch 'fix_death_test_child_mingw_wer_issue1116' of https://github.com/tanzislam/googletest into fix_death_test_child_mingw_wer_issue1116 2018-08-18 00:00:41 +01:00
Tanzinul Islam
9d77e63e12 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-08-17 23:58:45 +01:00
Gennadiy Civil
2a380bc26d
Merge branch 'master' into patch-1 2018-08-17 15:45:35 -04:00
Gennadiy Civil
e82d320567
Merge pull request #1748 from laixer/std 
std references shouldn't be fully qualified
 2018-08-17 15:44:11 -04:00
Vadim Berezniker
0796415314 std references shouldn't be fully qualified 2018-08-17 10:49:10 -07:00
Gennadiy Civil
cda442da0b
Formatting 2018-08-17 13:44:48 -04:00
Gennadiy Civil
edc1bc606e
Merge branch 'master' into patch-1 2018-08-17 13:31:01 -04:00
Gennadiy Civil
88cd66513c
Minor formatting/style changes 2018-08-17 13:25:52 -04:00
Conor Burgess
687964c84f
Merge branch 'master' into fix-argc 2018-08-17 17:15:32 +01:00
Gennadiy Civil
a9bd428e72
Merge branch 'master' into fix-msvc-d9025-warning 2018-08-17 11:48:56 -04:00
Gennadiy Civil
02a8ca8773
Merge pull request #1546 from henryiii/cleanup-cmake 
Clean up cache non-advanced variable for subproject
 2018-08-17 10:27:13 -04:00
Henry Schreiner
a65a993a3c
Merge branch 'master' into cleanup-cmake 2018-08-17 13:52:35 +02:00
Gennadiy Civil
f87798a3f7
Merge pull request #1646 from tisi1988/master 
FIX: Compilation warning with GCC regarding a non-initialised member …
 2018-08-16 15:28:20 -04:00
Gennadiy Civil
d20fa182a6
was not quite right, 
Fomatting
 2018-08-16 15:11:40 -04:00
Gennadiy Civil
b1bfdf0bf4
Small formatting change 
And then we can merge
 2018-08-16 15:10:07 -04:00
Gennadiy Civil
8c86040dd6
Merge branch 'master' into master 2018-08-16 13:37:53 -04:00
Gennadiy Civil
8b34930c62
Merge pull request #1142 from scottslacksmith/master 
Fix/silence false positive memory leaks reported by Microsoft's debug CRT
 2018-08-16 13:34:03 -04:00
Gennadiy Civil
c38f4b9f2c
Small style changes. 
Just small style changes and we can accept this PR
 2018-08-16 13:18:13 -04:00
Gennadiy Civil
21e518557a
Merge branch 'master' into josh/fix_scoped_class2 2018-08-16 11:13:12 -04:00
Gennadiy Civil
f3a9fa6a62
Merge branch 'master' into master 2018-08-16 10:39:40 -04:00
Gennadiy Civil
1dad4cf521
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 2018-08-16 10:35:56 -04:00