zjk/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,946 Commits 10 Branches 30 Tags
0563b52d3acc5661792cf1f8c78661a050afc883
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gennadiy Civil dea79290af Merge pull request #1633 from gennadiycivil/master 
ignore .md for appveyor builds
 2018-06-14 09:52:50 -04:00
Gennadiy Civil 61d162b348 Merge branch 'master' into master 2018-06-13 23:54:34 -04:00
Gennadiy Civil ce468a17c4 Merge pull request #1627 from atetubou/stdstring 
Reduce the number of strcmp calling while initialization
 2018-06-13 23:54:01 -04:00
Gennadiy Civil 885808cccb Merge pull request #1631 from gennadiycivil/master 
doc sync
 2018-06-13 14:51:41 -04:00
Gennadiy Civil c83e83eda0 Merge branch 'master' into stdstring 2018-06-13 10:51:02 -04:00
Gennadiy Civil 30ff9c3a5d Merge pull request #1626 from gennadiycivil/master 
Sync with internal docs
 2018-06-13 00:20:33 -04:00
Gennadiy Civil 1bccd6f353 Merge pull request #1625 from gennadiycivil/master 
doc sync
 2018-06-11 15:20:10 -04:00
Gennadiy Civil 9077ec7efe Merge pull request #1624 from gennadiycivil/master 
Adjust documentation files and links.
 2018-06-11 12:55:06 -04:00
Gennadiy Civil c091b0469a Merge pull request #1623 from Steelskin/fuchsia-fdio 
Fuchsia: Change fdio include path.
 2018-06-11 11:30:21 -04:00
Gennadiy Civil 98a0d007d7 Merge pull request #1619 from Steelskin/fuchsia-launchpad-removal 
Remove launchpad dependency from Fuchsia.
 2018-06-05 04:03:38 +02:00
Gennadiy Civil 2d136e5ec4 Merge branch 'master' into fuchsia-launchpad-removal 2018-06-04 18:00:20 +02:00
Gennadiy Civil 7e7f9d5fbf Merge pull request #1620 from gennadiycivil/master 
Adress, #1616, add  printer for std::nullptr_t
 2018-06-04 17:49:24 +02:00
Gennadiy Civil 7b08984da0 Merge branch 'master' into fuchsia-launchpad-removal 2018-06-04 16:54:25 +02:00
Gennadiy Civil db5f9ec567 Merge pull request #1608 from gennadiycivil/master 
formatting changes
 2018-06-01 10:19:07 +02:00
Gennadiy Civil 4e4df226fc Merge pull request #1607 from gennadiycivil/master 
Formatting changes
 2018-05-23 08:15:50 -07:00
Gennadiy Civil 145d05750b Merge pull request #1603 from Steelskin/unused-variable-fuchsia 
Remove unused variable in Fuchsia.
 2018-05-22 06:31:53 -07:00
Gennadiy Civil 32c84be0fc Merge branch 'master' into unused-variable-fuchsia 2018-05-22 06:01:05 -07:00
Gennadiy Civil 8276dbae6f Merge pull request #1591 from sgraham/disabled-rtti 
Fix gmock not building when -fno-rtti
 2018-05-22 06:00:40 -07:00
Gennadiy Civil 3b22e21cc8 Merge branch 'master' into disabled-rtti 2018-05-22 05:34:05 -07:00
Gennadiy Civil 1814bed8ec Merge pull request #1601 from jdennett/StdLibVersioning 
Std lib versioning
 2018-05-22 05:32:53 -07:00
Gennadiy Civil 08d5b1f33a Merge pull request #1597 from jaeheonlee/master 
Fix a bug with ad_hoc_test_result() functions of UnitTest and TestCase classes
 2018-05-11 09:05:24 -04:00
Gennadiy Civil 045e7f9ee4 Merge pull request #1593 from Steelskin/fuchsia_death_test 
Add death test support for Fuchsia.
 2018-05-07 14:43:09 -04:00
Gennadiy Civil 278aba369c Merge pull request #1589 from sgraham/rtti-build 
Add no-exception and no-rtti to build matrix
 2018-05-01 13:07:29 -04:00
Gennadiy Civil dc043e1ca6 Merge pull request #1588 from gennadiycivil/master 
mostly 193547722
 2018-04-25 13:28:20 -04:00
Gennadiy Civil a6f06bf2fd Merge pull request #1582 from dnsunderland/parameterless 
Introduce parameterless expectations
 2018-04-19 18:44:01 -04:00
Gennadiy Civil 884bcdaf18 Merge branch 'master' into parameterless 2018-04-19 18:35:17 -04:00
Gennadiy Civil 1114a0202a Merge pull request #1580 from gennadiycivil/master 
merging
 2018-04-19 11:57:52 -04:00
Gennadiy Civil 4bd8c4638a Merge pull request #1579 from gennadiycivil/master 
193353312
 2018-04-18 10:57:04 -04:00
Gennadiy Civil 4035d6ecc0 Merge pull request #1577 from gennadiycivil/master 
merging gmock generated matchers
 2018-04-17 19:44:13 -04:00
Gennadiy Civil 1f605414cc Merge pull request #1576 from gennadiycivil/master 
merging
 2018-04-16 11:02:12 -04:00
Gennadiy Civil 247ded3236 Merge pull request #1571 from gennadiycivil/master 
merging, gmock actions test
 2018-04-14 19:24:19 -04:00
Gennadiy Civil 38de61d73b Merge pull request #1569 from gennadiycivil/master 
merging
 2018-04-13 09:41:33 -04:00
Gennadiy Civil 0957cce368 Merge pull request #1568 from gennadiycivil/master 
merging
 2018-04-12 18:56:57 -04:00
Gennadiy Civil 6fb65b8215 Merge pull request #1567 from gennadiycivil/master 
merging
 2018-04-12 14:41:48 -04:00
Gennadiy Civil 3ccd6e3809 Merge pull request #1566 from gennadiycivil/master 
merging
 2018-04-12 13:55:37 -04:00
Gennadiy Civil 531e29485c Merge pull request #1562 from gennadiycivil/master 
small cleanup
 2018-04-12 11:45:40 -04:00
Gennadiy Civil b640d8743d Merge pull request #1557 from pwnall/gmock-fix-ub 
Remove multiple inheritance from "unintesting call" mock classes.
 2018-04-12 09:13:11 -04:00
Gennadiy Civil fdb57f8571 Merge pull request #1561 from gennadiycivil/master 
Merging gmock-actions
 2018-04-11 16:06:23 -04:00
Gennadiy Civil 6273647250 Merge pull request #1560 from gennadiycivil/master 
Upstream cl/192179348
 2018-04-11 15:38:15 -04:00
Gennadiy Civil b4429c9219 Merge pull request #1559 from gennadiycivil/master 
Upstream cl 191754725
 2018-04-11 13:57:33 -04:00
Gennadiy Civil d5988e7dd0 Merge pull request #1558 from gennadiycivil/master 
RE-Doing the merge, this time with gcc on mac in the PR
 2018-04-11 10:22:10 -04:00
Gennadiy Civil 8fbb419470 Include gcc on mac into PR matrix 
There was an error that slipped through and only showed up on PR merge (https://travis-ci.org/google/googletest/jobs/364304396/config ) , we dont want that again
 2018-04-10 11:28:16 -04:00
Gennadiy Civil a072611118 Merge pull request #1556 from google/revert-1551-master 
Revert "gmock actions 2"
 2018-04-09 22:37:50 -04:00
Gennadiy Civil ca54b67303 Revert "gmock actions 2" 2018-04-09 22:10:12 -04:00
Gennadiy Civil 7f03f7ceae Merge pull request #1551 from gennadiycivil/master 
gmock actions 2
 2018-04-09 16:34:54 -04:00
Gennadiy Civil 7529698fa3 Merge pull request #1552 from pwnall/mock-pump 
Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h
 2018-04-09 09:28:35 -04:00
Gennadiy Civil 82febb8eaf Merge pull request #1549 from gennadiycivil/master 
Merging gMock, 2
 2018-04-05 16:20:18 -04:00
Gennadiy Civil d0905653ed Merge pull request #1547 from gennadiycivil/master 
Matchers testing
 2018-04-05 14:53:02 -04:00
Gennadiy Civil 2cf2a1f8ce Merge pull request #1545 from gennadiycivil/master 
merging gmock matchers 1
 2018-04-04 16:14:41 -04:00
Gennadiy Civil f7098a2a4d Merge branch 'master' into master 2018-04-04 16:01:44 -04:00
Gennadiy Civil 891e436c6c Merge pull request #1543 from fo40225/fix_locale_win 
fix build break on locale windows
 2018-04-04 14:28:11 -04:00
Gennadiy Civil fbe3c94533 Merge branch 'master' into fix_locale_win 2018-04-04 13:58:55 -04:00
Gennadiy Civil 4377699066 Merge pull request #1542 from gennadiycivil/master 
Tweaking #1523 to exclude nacl, cl 191591810
 2018-04-04 11:35:28 -04:00
Gennadiy Civil 07af8af373 Merge pull request #1523 from leissa/int3 
provide alternative for DebugBreak()
 2018-04-04 10:51:46 -04:00
Gennadiy Civil 98687b7847 Merge branch 'master' into int3 2018-04-03 16:31:59 -04:00
Gennadiy Civil 7d955430d1 Merge pull request #1541 from gennadiycivil/master 
Upstream, 191344765
 2018-04-03 16:28:53 -04:00
Gennadiy Civil 18be012457 Merge branch 'master' into int3 2018-04-03 16:27:32 -04:00
Gennadiy Civil ac783bd787 Merge pull request #1539 from gennadiycivil/master 
merging port, continue
 2018-04-03 15:26:44 -04:00
Gennadiy Civil 27507429cb Merge branch 'master' into int3 2018-04-03 11:44:23 -04:00
Gennadiy Civil 6c9d07f112 Merge pull request #1538 from gennadiycivil/master 
merging , cont
 2018-04-03 11:18:56 -04:00
Gennadiy Civil 653a435f99 Merge pull request #1537 from gennadiycivil/master 
gtest-port.h merge
 2018-04-03 10:09:08 -04:00
Gennadiy Civil 9df719da8d Merge pull request #1534 from gennadiycivil/master 
merging gtest-port.h, again - 1
 2018-04-02 16:03:22 -04:00
Gennadiy Civil 7888184f28 Include OSX builds back into PR builds 
Had an instance where the breakage was not detected until the actual merge. Need to be better than that
 2018-03-29 13:50:32 -04:00
Gennadiy Civil 86d14079be Merge pull request #1527 from google/revert-1518-master 
Revert "merging gtest-port 1 of N"
 2018-03-29 13:28:47 -04:00
Gennadiy Civil b2373c6f51 Revert "merging gtest-port 1 of N" 2018-03-29 13:28:29 -04:00
Gennadiy Civil 527fd38867 Merge pull request #1526 from google/revert-1525-master 
Revert "merging gtest-port, 2"
 2018-03-29 13:28:04 -04:00
Gennadiy Civil 54bb165ffd Revert "merging gtest-port, 2" 2018-03-29 13:27:11 -04:00
Gennadiy Civil 09a0e17c6a Merge pull request #1525 from gennadiycivil/master 
merging gtest-port, 2
 2018-03-29 10:24:19 -04:00
Gennadiy Civil 9dde7c4e8c Merge pull request #1518 from gennadiycivil/master 
merging gtest-port 1 of N
 2018-03-27 15:39:32 -04:00
Gennadiy Civil cafa9e5228 Merge pull request #1515 from gennadiycivil/master 
merges
 2018-03-26 14:10:38 -04:00
Gennadiy Civil 78579756a8 Merge pull request #1512 from gennadiycivil/master 
merges, gmock - 1
 2018-03-26 11:19:10 -04:00
Gennadiy Civil dfa853b63d Merge pull request #1510 from gennadiycivil/master 
More merges, restruct some
 2018-03-22 16:21:26 -04:00
Gennadiy Civil a1692ed133 Merge branch 'master' into master 2018-03-22 12:56:01 -04:00
Gennadiy Civil eaaa422c52 Update appveyor.yml 2018-03-22 11:48:21 -04:00
Gennadiy Civil dccc2d6754 Merge pull request #1508 from gennadiycivil/master 
merge, again, IsRecursiveContainer
 2018-03-19 13:32:25 -04:00
Gennadiy Civil a325ad2db5 Merge pull request #1504 from gennadiycivil/master 
Merges
 2018-03-14 11:21:53 -04:00
Gennadiy Civil f35fe6de3b Merge pull request #1503 from sheepmaster/upstream_188748737 
Allow macros inside of parametrized test names.
 2018-03-12 15:04:50 -04:00
Gennadiy Civil abc6e943e0 Merge pull request #1502 from gennadiycivil/master 
merges-port(1)
 2018-03-12 12:39:13 -04:00
Gennadiy Civil 9bda90b7e5 Merge pull request #1497 from gennadiycivil/master 
Merging, XML tests
 2018-03-07 16:14:48 -05:00
Gennadiy Civil 703b4a85a2 Merge pull request #1493 from gennadiycivil/master 
merges-8
 2018-03-05 16:15:02 -05:00
Gennadiy Civil 617e2c5615 Merge pull request #1492 from gennadiycivil/master 
merges-7
 2018-03-05 15:52:38 -05:00
Gennadiy Civil ae4480f923 Merge pull request #1491 from gennadiycivil/master 
merges-6
 2018-03-05 14:41:37 -05:00
Gennadiy Civil 731dbc4a78 Merge pull request #1490 from gennadiycivil/master 
merges-4
 2018-03-05 14:17:40 -05:00
Gennadiy Civil c3a007f3cf Merge pull request #1489 from gennadiycivil/master 
Merges-2
 2018-03-05 13:51:15 -05:00
Gennadiy Civil a7ffeca974 Merge pull request #1488 from gennadiycivil/master 
Merges
 2018-03-05 13:21:59 -05:00
Gennadiy Civil 915c8d051d Merge pull request #1477 from sgraham/unsigned-wchar 
Try to handle unsigned wchar_t (arm) a bit better
 2018-03-05 11:03:08 -05:00
Gennadiy Civil 829a8c966b Merge branch 'master' into unsigned-wchar 2018-03-05 10:43:19 -05:00
Gennadiy Civil 6c73adfc03 Merge pull request #1486 from petrhosek/json-stacktrace 
Use a full message in the JSON output for failures
 2018-03-02 14:32:06 -05:00
Gennadiy Civil f8fbe1c821 Merge branch 'master' into unsigned-wchar 2018-03-01 11:18:17 -05:00
Gennadiy Civil 447d58b4ee Merge pull request #1485 from coryan/parallelize-appveyor 
Add options to parallelize builds.
 2018-02-28 15:23:40 -05:00
Gennadiy Civil 18d270e335 Merge pull request #1479 from petrhosek/json 
Support JSON output format in addition to XML
 2018-02-28 14:50:35 -05:00
Gennadiy Civil 3817871beb Merge branch 'master' into json 2018-02-28 14:39:17 -05:00
Gennadiy Civil 9557d29b7a Merge pull request #1481 from dneto0/debug-postfix 
Use DEBUG_POSTFIX instead of CMAKE_DEBUG_POSTFIX
 2018-02-28 08:55:39 -05:00
Gennadiy Civil 66d71756a7 Merge branch 'master' into debug-postfix 2018-02-28 08:43:57 -05:00
Gennadiy Civil fe1144246e Merge pull request #1482 from zhangxy988/variant_matcher 
Add matcher for std::variant.
 2018-02-27 16:58:28 -05:00
Gennadiy Civil a9f2368dc0 Merge pull request #1483 from gennadiycivil/master 
gmock merging -2
 2018-02-27 14:39:41 -05:00
Gennadiy Civil ba40fd1456 Merge branch 'master' into master 2018-02-27 14:10:27 -05:00
Gennadiy Civil ce61dc54a2 Merge pull request #1423 from pcc/win-libcxx2 
Use _CPPUNWIND instead of _HAS_EXCEPTIONS with MSVC.
 2018-02-27 14:00:29 -05:00
Gennadiy Civil 837c246370 Merge branch 'master' into unsigned-wchar 2018-02-27 13:19:57 -05:00
Gennadiy Civil ab46d9550b Merge branch 'master' into debug-postfix 2018-02-27 13:19:35 -05:00