53 Commits
Author SHA1 Message Date
Billy Donahue ce7ec96eda Rollback change #808. 2016-06-26 18:33:10 -04: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 4e8f8cc3e2 build once 2015-09-01 02:50:19 -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 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 bbb54ef0ee travis config 2015-08-31 02:19:39 -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 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 ecf9459561 Merge remote-tracking branch 'google/master' 2015-08-26 00:52:34 -04:00
Billy Donahue 8a3c8c9376 tiny fix 2015-08-25 18:33:08 -04:00
Billy Donahue 5b3ef3bd6c unified project home 2015-08-25 18:23:36 -04:00
Billy Donahue 7563fe553e cat _home.md files into README.md 2015-08-25 17:56:57 -04:00
Billy Donahue 67f6188c8f move ProjectHome files into root 2015-08-25 17:55:28 -04:00
Billy Donahue ad47332a7a Merge branch 'unification' of github.com:BillyDonahue/googlemock into unification 2015-08-25 17:49:49 -04:00
Billy Donahue affb09edf0 move googlemock files into googlemock/ subdir 2015-08-25 17:47:18 -04:00
Billy Donahue 1f87a0970d Move everything in googletest into googletest/googletest 2015-08-25 16:18:00 -04:00
Billy Donahue 84b8863dd9 Merge remote-tracking branch 'google/master' 2015-08-25 15:54:26 -04:00
Billy Donahue 3e42adb74f move versioned docs to version directories 2015-08-25 15:42:30 -04:00
Billy Donahue 06fcd9ff11 readme.md updates 2015-08-25 13:51:43 -04:00
Billy Donahue 36d1a71bad README -> README.md 2015-08-25 13:47:38 -04:00
Billy Donahue 872c422ec2 move CheatSheet.md into docs 2015-08-25 13:47:06 -04:00
Billy Donahue 3b6c87d413 Move all .md files from wiki into docs/ dir. 2015-08-25 13:32:45 -04:00
Billy Donahue 26effd4ac9 Merge branch 'wiki' of github.com:BillyDonahue/googlemock into wiki 2015-08-25 13:29:00 -04:00
Billy Donahue 72d4ca6685 dhood suggestions 2015-08-24 13:36:02 -04:00
Billy Donahue 613e23a4bf Move wiki .md files to docs/ folder. 2015-08-22 17:35:22 -04:00
Billy Donahue 6698939b32 Merge branch 'master' into wiki 2015-08-22 17:31:55 -04:00
Billy Donahue e6ad956e00 Merge branch 'wiki' of github.com:BillyDonahue/googletest into wiki 2015-08-22 17:27:48 -04:00
Billy Donahue a47310a1c1 Rename README->README.md 2015-08-22 15:59:01 -04:00
Billy Donahue 524958b444 Remove execute permissions from msvc/ files. 2015-08-21 14:31:06 -04:00
Billy Donahue 98f62c9cdd Codegear files should be CRLF. 2015-08-21 14:16:55 -04:00
Billy Donahue 02730de6e3 Exported by script 2015-08-21 13:49:44 -04:00
billydonahue 1f5fdea417 Push several shanges:
Make single argument constructors explicit in macros.

    Remove NOMINMAX macro.

    Add macros for disabling Microsoft Visual C++ warnings.

    Add WhenDynamicCastTo<T> matcher.
    A matcher that matches a pointer that matches inner_matcher when
    dynamic_cast<T> is applied.

    Add IWYU export pragmas to the tuple include lines.

    Fix NativeArray to not require a copy constructor unless we ask for one.
    This allows ElementsAre() to support non-copyable types.

    Examine WINAPI_FAMILY_PARTITION macros to better distinguish windows platforms.
    Author: martin@martin.st
    From: https://codereview.appspot.com/57220043/
2014-05-19 17:54:51 +00:00
billydonahue 8120f66c32 Push upstream to SVN. 2014-05-15 19:42:15 +00:00