Commit Graph

2484 Commits

Author SHA1 Message Date
Jerry Turcios
299d098daa Merge branch 'master' of https://github.com/google/googletest 2018-10-24 23:18:50 -04:00
Gennadiy Civil
8ec8ce1c8a
Merge pull request #1934 from jeffvandyke/patch-2
Change CMake googletest download location in docs
2018-10-24 19:00:57 -04:00
Jeff VanDyke
c45631823c
Change CMake googletest download location in docs
Change CMAKE_BINARY_DIR to CMAKE_CURRENT_BINARY_DIR
Able to use in a subfolder's CMakeLists.txt
2018-10-24 16:41:14 -04:00
Gennadiy Civil
6463ee81ae Merge pull request #1890 from peterjc123:clang_fix
PiperOrigin-RevId: 218515152
2018-10-24 11:26:24 -04:00
durandal
59f90a338b Googletest export
Honor GTEST_SKIP() in SetUp().

PiperOrigin-RevId: 218387359
2018-10-24 11:26:16 -04:00
Jerry Turcios
2801b23807 Merge branch 'master' of https://github.com/google/googletest 2018-10-24 10:59:24 -04:00
peter
478a518590
Disable extensions and force standard 2018-10-24 12:17:06 +08:00
peter
f6dadcf1f1
Revert previous changes 2018-10-24 12:06:00 +08:00
peter
96824f11c6
Fix -std=c++11 flag 2018-10-24 12:03:07 +08:00
Gennadiy Civil
3bb00b7ead
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
6e37201260 Merge branch 'master' of https://github.com/google/googletest 2018-10-23 20:57:38 -04:00
Joel Anderson
9b637237bd 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
7b6b3be342
Update advanced.md
Fixes #1802
2018-10-23 17:27:38 -04:00
Gennadiy Civil
20eaf6e3a9 Merge pull request #1911 from BrukerJWD:isnice
PiperOrigin-RevId: 218384341
2018-10-23 15:13:42 -04:00
Gennadiy Civil
a743780ad0
Update advanced.md
Fixes #1755
2018-10-23 11:16:46 -04:00
Gennadiy Civil
b974af7923
Update advanced.md
Fixes #1925
2018-10-23 11:09:15 -04:00
Gennadiy Civil
90c957c408
Merge pull request #1927 from svg153/patch-1
ACTION table format
2018-10-23 10:51:30 -04:00
Sergio Valverde
58a8da64ce
ACTION table format 2018-10-23 07:57:23 +02:00
Jerry Turcios
3468af9b36 Merge branch 'master' of https://github.com/google/googletest 2018-10-22 21:16:20 -04:00
Abseil Team
82987067d8 Googletest export
Change ValuesArray to require much less template instantiation depth.

PiperOrigin-RevId: 218170842
2018-10-22 11:29:14 -04:00
Gennadiy Civil
32dbcac06e Merge pull request #1839 from Peter-Levine:python3-tests
PiperOrigin-RevId: 217925156
2018-10-22 11:29:06 -04:00
Gennadiy Civil
572050dd28 Merge pull request #1905 from fandjelo:relocatable-pkgconfig-fix
PiperOrigin-RevId: 217923705
2018-10-22 11:28:57 -04:00
Jerry Turcios
648ac832aa Merge branch 'master' of https://github.com/google/googletest 2018-10-19 23:13:06 -04:00
Gennadiy Civil
c955e33497
Merge branch 'master' into python3-tests 2018-10-19 13:30:13 -07:00
Gennadiy Civil
f410177a8b
Update .travis.yml
Revert attempted template depth fix , a real fix is coming
2018-10-19 12:27:17 -07:00
Gennadiy Civil
723f26663f
Update .travis.yml
Testing increasing -ftemplate-depth to fix clang 3.9
2018-10-18 14:27:39 -07:00
misterg
663ef8636a 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
3a7f0934d6 Merge pull request #1912 from kakkoko:fix-xml-name
PiperOrigin-RevId: 217576541
2018-10-18 11:32:30 -04:00
Abseil Team
29b47e45cf Googletest export
C++11 code cleanup.

PiperOrigin-RevId: 217364243
2018-10-18 11:32:16 -04:00
Gennadiy Civil
2c19680bf9
Merge branch 'master' into relocatable-pkgconfig-fix 2018-10-17 09:51:26 -07:00
kakkoko
baf6845b18 Fix incorrect XML file name in help message 2018-10-17 10:09:09 +09:00
Jonathan Wendeborn
0cefda7749
Removed last reference to internal::kDefault 2018-10-16 08:51:33 +02:00
Jonathan Wendeborn
96d1615772
Merge branch 'isnice' of https://github.com/BrukerJWD/googletest into isnice 2018-10-16 08:38:34 +02:00
BrukerJWD
8c82ba48e4
Merge branch 'master' into isnice 2018-10-16 08:37:56 +02:00
Jonathan Wendeborn
386391b014
Use existing Mock::GetReactionOnUninterestingCalls() 2018-10-16 08:37:45 +02:00
Jonathan Wendeborn
6bbf911a8d
Don't fully qualify enum member 2018-10-16 08:19:02 +02:00
Jonathan Wendeborn
67a240a107
Added Mock::IsNaggy, IsNice, and IsStrict 2018-10-16 08:07:15 +02:00
Jerry Turcios
9424e7b0d2 Merge branch 'master' of https://github.com/google/googletest 2018-10-12 19:02:15 -04:00
Gennadiy Civil
a651a4d44e Merge pull request #1908 from rwoldberg:master
PiperOrigin-RevId: 216909845
2018-10-12 16:12:32 -04:00
Robert Woldberg
dec3b81a08 Change types to remove cast warnings. 2018-10-12 11:12:55 -06:00
Gennadiy Civil
754cb8ed96
Merge branch 'master' into relocatable-pkgconfig-fix 2018-10-12 12:44:33 -04:00
Jerry Turcios
8fad86e757 Merge branch 'master' of https://github.com/google/googletest 2018-10-11 21:18:34 -04:00
misterg
864b6c2d35 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
b3b19a796c Merge c41b2bf861ef2ac1a975af05ff66d9256f280b01 into f203b2db77
Closes #1899

PiperOrigin-RevId: 216719020
2018-10-11 13:31:25 -04:00
Gennadiy Civil
f203b2db77
Merge pull request #1902 from theryee/typo
Fix typo
2018-10-11 13:15:47 -04:00
David Neto
ad997b16b5 Merge 4c92120d6dedb4eeb499a8702faea0224e0a8b23 into 658c6390a5
Closes #1893

PiperOrigin-RevId: 216712426
2018-10-11 12:52:55 -04:00
Aaron Dierking
e7327c13f6 Merge 41fc9745d4a448db7d932250d22fac1dda287443 into 658c6390a5
Accepts #1889

PiperOrigin-RevId: 216709878
2018-10-11 12:44:07 -04:00
Abseil Team
bc6a4ce380 Project import generated by Copybara.
PiperOrigin-RevId: 216423319
2018-10-11 12:44:00 -04:00
misterg
0e71eb069a Internal Change
PiperOrigin-RevId: 216417182
2018-10-11 12:43:52 -04:00
Filipp Andjelo
095b3113e7 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