peter
c3f5e8c3d4
Revert previous changes
2018-10-24 12:06:00 +08:00
peter
207fc9bedc
Fix -std=c++11 flag
2018-10-24 12:03:07 +08:00
Gennadiy Civil
0a78ff41d2
Merge pull request #1929 from goatshriek/cmake-cxx11-flag
...
add documentation of manual c++11 specification
2018-10-23 22:32:15 -04:00
Jerry Turcios
68d0d76159
Merge branch 'master' of https://github.com/google/googletest
2018-10-23 20:57:38 -04:00
Joel Anderson
14c0e4ab99
add documentation of manual c++11 specification
...
Per #1883 , builds of Google Test may fail if the version C++ is not manually
set to C++11 during the build process.
Signed-off-by: Joel Anderson <joelanderson333@gmail.com>
2018-10-23 20:28:43 -04:00
Gennadiy Civil
f09a820014
Update advanced.md
...
Fixes #1802
2018-10-23 17:27:38 -04:00
Gennadiy Civil
4887e99ed1
Merge pull request #1911 from BrukerJWD:isnice
...
PiperOrigin-RevId: 218384341
2018-10-23 15:13:42 -04:00
Gennadiy Civil
a77b6b158a
Update advanced.md
...
Fixes #1755
2018-10-23 11:16:46 -04:00
Gennadiy Civil
53e6141f52
Update advanced.md
...
Fixes #1925
2018-10-23 11:09:15 -04:00
Gennadiy Civil
1fe6689c03
Merge pull request #1927 from svg153/patch-1
...
ACTION table format
2018-10-23 10:51:30 -04:00
Sergio Valverde
3860616231
ACTION table format
2018-10-23 07:57:23 +02:00
Jerry Turcios
a53713527d
Merge branch 'master' of https://github.com/google/googletest
2018-10-22 21:16:20 -04:00
Abseil Team
f557390b86
Googletest export
...
Change ValuesArray to require much less template instantiation depth.
PiperOrigin-RevId: 218170842
2018-10-22 11:29:14 -04:00
Gennadiy Civil
b7c8d3dafa
Merge pull request #1839 from Peter-Levine:python3-tests
...
PiperOrigin-RevId: 217925156
2018-10-22 11:29:06 -04:00
Gennadiy Civil
a79c35d96f
Merge pull request #1905 from fandjelo:relocatable-pkgconfig-fix
...
PiperOrigin-RevId: 217923705
2018-10-22 11:28:57 -04:00
Jerry Turcios
a6e4bf9b8e
Merge branch 'master' of https://github.com/google/googletest
2018-10-19 23:13:06 -04:00
Gennadiy Civil
82c3317039
Merge branch 'master' into python3-tests
2018-10-19 13:30:13 -07:00
Gennadiy Civil
c618fd7c5d
Update .travis.yml
...
Revert attempted template depth fix , a real fix is coming
2018-10-19 12:27:17 -07:00
Gennadiy Civil
a78d7b5369
Update .travis.yml
...
Testing increasing -ftemplate-depth to fix clang 3.9
2018-10-18 14:27:39 -07:00
misterg
2ca432c90a
Googletest export
...
New variadic implementation for gtest-param-test
Removed non-variadic implementation and added variadic for ValueArray and Values
PiperOrigin-RevId: 217703627
2018-10-18 11:32:37 -04:00
Gennadiy Civil
176e4ef620
Merge pull request #1912 from kakkoko:fix-xml-name
...
PiperOrigin-RevId: 217576541
2018-10-18 11:32:30 -04:00
Abseil Team
b1f6f40f1a
Googletest export
...
C++11 code cleanup.
PiperOrigin-RevId: 217364243
2018-10-18 11:32:16 -04:00
Gennadiy Civil
148b17258d
Merge branch 'master' into relocatable-pkgconfig-fix
2018-10-17 09:51:26 -07:00
kakkoko
500f754824
Fix incorrect XML file name in help message
2018-10-17 10:09:09 +09:00
Jonathan Wendeborn
3dc4516fa1
Removed last reference to internal::kDefault
2018-10-16 08:51:33 +02:00
Jonathan Wendeborn
bba91d6669
Merge branch 'isnice' of https://github.com/BrukerJWD/googletest into isnice
2018-10-16 08:38:34 +02:00
BrukerJWD
55d2fbfe0d
Merge branch 'master' into isnice
2018-10-16 08:37:56 +02:00
Jonathan Wendeborn
a69718965a
Use existing Mock::GetReactionOnUninterestingCalls()
2018-10-16 08:37:45 +02:00
Jonathan Wendeborn
ad519f83db
Don't fully qualify enum member
2018-10-16 08:19:02 +02:00
Jonathan Wendeborn
7014070b27
Added Mock::IsNaggy, IsNice, and IsStrict
2018-10-16 08:07:15 +02:00
Jerry Turcios
d360657d43
Merge branch 'master' of https://github.com/google/googletest
2018-10-12 19:02:15 -04:00
Gennadiy Civil
af5df9cbca
Merge pull request #1908 from rwoldberg:master
...
PiperOrigin-RevId: 216909845
2018-10-12 16:12:32 -04:00
Robert Woldberg
2e8ddd72be
Change types to remove cast warnings.
2018-10-12 11:12:55 -06:00
Gennadiy Civil
eef8b1644f
Merge branch 'master' into relocatable-pkgconfig-fix
2018-10-12 12:44:33 -04:00
Jerry Turcios
caf0ce5ee3
Merge branch 'master' of https://github.com/google/googletest
2018-10-11 21:18:34 -04:00
misterg
589e55433e
Remove duplicate functionality PrintValue (in googletest-param-test-test.cc), use testing::PrintToString
...
PiperOrigin-RevId: 216733373
2018-10-11 16:15:32 -04:00
KO Myung-Hun
400d3b1a5f
Merge c41b2bf861
into f203b2db77
...
Closes #1899
PiperOrigin-RevId: 216719020
2018-10-11 13:31:25 -04:00
Gennadiy Civil
3bd8c37f38
Merge pull request #1902 from theryee/typo
...
Fix typo
2018-10-11 13:15:47 -04:00
David Neto
0f1f66c604
Merge 4c92120d6d
into 658c6390a5
...
Closes #1893
PiperOrigin-RevId: 216712426
2018-10-11 12:52:55 -04:00
Aaron Dierking
268430fab8
Merge 41fc9745d4
into 658c6390a5
...
Accepts #1889
PiperOrigin-RevId: 216709878
2018-10-11 12:44:07 -04:00
Abseil Team
697d8f386e
Project import generated by Copybara.
...
PiperOrigin-RevId: 216423319
2018-10-11 12:44:00 -04:00
misterg
82922524f4
Internal Change
...
PiperOrigin-RevId: 216417182
2018-10-11 12:43:52 -04:00
Filipp Andjelo
1ccfeccee9
Use pcfiledir for prefix in pkgconfig file
...
Using absolute paths in the pkg-config file makes it not relocatable and
leads to problems, when trying to use it with precompiled cross
toolchains. Setting prefix to relative path based on pcfiledir makes it
more reliable for such cases.
2018-10-11 14:09:57 +02:00
Ryan Yee
6488079dfe
Merge branch 'master' into typo
2018-10-11 01:22:25 -07:00
Ryan Yee
fee2e6cb2b
fix typo
2018-10-11 01:13:09 -07:00
Gennadiy Civil
8f21765766
Merge pull request #1898 from spartucus/master
...
Update .gitignore
2018-10-10 15:28:58 -04:00
Tengfei Niu
79e7eddbec
Update .gitignore
...
ignore .DS_Store on macOS.
2018-10-10 11:53:37 +08:00
Jerry Turcios
27e851fa30
Merge branch 'master' of https://github.com/google/googletest
2018-10-09 20:47:38 -04:00
misterg
b208478537
Remove non-variadic pre C++11 AnyOf
...
PiperOrigin-RevId: 216411381
2018-10-09 16:30:37 -04:00
Abseil Team
dd4e36663c
Unconditionally use std::tuple.
...
Remove all mention of TR1 tuple and our own implementation of tuple.
PiperOrigin-RevId: 216395043
2018-10-09 16:25:58 -04:00