Integrate the most recent Google Test | Mock
-
Thell Fowler
- Assigned user set to Thell Fowler
I'll be glad to do this. Should we keep two distinct projects (Test and Mock) as submodules, or change to a single Google Mock install since it bundles Google Test?
That would not alter the environment variable usage method.
-
Jocelyn Legault
The previous version did also include GTest, but I yanked it out for the version I brought to our depot.
My heart goes to keep them as separate projects, but I could be blind to other considerations you might see.
I suggest you try it out and do whatever you feel is right. I'll follow.
The only thing I'd like to keep is the capability to have the GStuff in a separate repo that I can put wherever I feel like, and not necessarily under the N++CR arborescence. -
Thell Fowler
- State changed from new to open
-
Thell Fowler
(from [8c111e47b5b9a1f73aba8b037cf4bbf872e43f86]) google projects: update to test/mock version 1.4
- Remove dependency of Boost TR1 from VC 8 project since Google Test and Mock version 1.4 includes an implementation of the TR1 tuple.
- Use both Google projects as side-by-side capable libraries to allow VC8 and VC9 debug and release builds to happily co-exist.
[#31 Integrate the most recent Google Test | Mock]
Signed-off-by: Thell Fowler git@tbfowler.name
http://github.com/almostautomated/npp-community/commit/8c111e47b5b9... -
Thell Fowler
- State changed from open to needs_ack
- Assigned user changed from Thell Fowler to npp-community
This essentially invalidates LH-19 since the 1.4 update includes the side-by-side setup in the Test and Mock, so N++ needed to use it too.
-
Thell Fowler
(from [c839c280b349f137748ae060099ddf8be896225c]) google projects: update to test/mock version 1.4
- Remove dependency of Boost TR1 from VC 8 project since Google Test and Mock version 1.4 includes an implementation of the TR1 tuple.
- Use both Google projects as side-by-side capable libraries to allow VC8 and VC9 debug and release builds to happily co-exist.
[#31 Integrate the most recent Google Test | Mock]
Signed-off-by: Thell Fowler git@tbfowler.name
http://github.com/almostautomated/npp-community/commit/c839c280b349... -
Jocelyn Legault
- State changed from needs_ack to acked
GTest and GMock compile fine in all configuration, and so does N++CR when linking against the new libs.
Good work! :-)
-
Thell Fowler
- State changed from acked to proposed
-
Thell Fowler
- Assigned user cleared.
- State changed from proposed to resolved
Promoted to master
Changeset [66d08610a297bca5adcf0be4de16ed5371a6ce76] by Thell Fowler
February 26th, 2010 @ 04:51 PM
Merge branch 'tf/LH-31/google-test-and-mock-update'
- tf/LH-31/google-test-and-mock-update: google projects: update to test/mock version 1.4
Conflicts:
google_mock
google_testhttp://github.com/npp-community/npp-community/commit/66d08610a297bc...
Committed by Thell Fowler
Please Sign in or create a free account to add a new ticket.
With your very own profile, you can contribute to projects, track your activity, watch tickets, receive and update tickets through your email and much more.