Merge from core, plus convert the node spec tests to gtest

a4382b13 · Jesse Beder · be85bb32 · ace9c49e · a4382b13 · a4382b13
Commit a4382b13 authored Mar 23, 2014 by Jesse Beder
20 changed files
--- a/test/gmock-1.7.0/include/gmock/internal/gmock-internal-utils.h
+++ b/test/gmock-1.7.0/include/gmock/internal/gmock-internal-utils.h
--- a/test/gmock-1.7.0/include/gmock/internal/gmock-port.h
+++ b/test/gmock-1.7.0/include/gmock/internal/gmock-port.h
--- a/test/gmock-1.7.0/make/Makefile
+++ b/test/gmock-1.7.0/make/Makefile
--- a/test/gmock-1.7.0/msvc/2005/gmock.sln
+++ b/test/gmock-1.7.0/msvc/2005/gmock.sln
--- a/test/gmock-1.7.0/msvc/2005/gmock.vcproj
+++ b/test/gmock-1.7.0/msvc/2005/gmock.vcproj
--- a/test/gmock-1.7.0/msvc/2005/gmock_config.vsprops
+++ b/test/gmock-1.7.0/msvc/2005/gmock_config.vsprops
--- a/test/gmock-1.7.0/msvc/2005/gmock_main.vcproj
+++ b/test/gmock-1.7.0/msvc/2005/gmock_main.vcproj
--- a/test/gmock-1.7.0/msvc/2005/gmock_test.vcproj
+++ b/test/gmock-1.7.0/msvc/2005/gmock_test.vcproj
--- a/test/gmock-1.7.0/msvc/2010/gmock.sln
+++ b/test/gmock-1.7.0/msvc/2010/gmock.sln
--- a/test/gmock-1.7.0/msvc/2010/gmock.vcxproj
+++ b/test/gmock-1.7.0/msvc/2010/gmock.vcxproj
--- a/test/gmock-1.7.0/msvc/2010/gmock_config.props
+++ b/test/gmock-1.7.0/msvc/2010/gmock_config.props
--- a/test/gmock-1.7.0/msvc/2010/gmock_main.vcxproj
+++ b/test/gmock-1.7.0/msvc/2010/gmock_main.vcxproj
--- a/test/gmock-1.7.0/msvc/2010/gmock_test.vcxproj
+++ b/test/gmock-1.7.0/msvc/2010/gmock_test.vcxproj
--- a/test/gmock-1.7.0/scripts/fuse_gmock_files.py
+++ b/test/gmock-1.7.0/scripts/fuse_gmock_files.py
--- a/test/gmock-1.7.0/scripts/generator/LICENSE
+++ b/test/gmock-1.7.0/scripts/generator/LICENSE
--- a/test/gmock-1.7.0/scripts/generator/README
+++ b/test/gmock-1.7.0/scripts/generator/README
--- a/test/gmock-1.7.0/scripts/generator/README.cppclean
+++ b/test/gmock-1.7.0/scripts/generator/README.cppclean
--- a/test/gmock-1.7.0/scripts/generator/cpp/__init__.py
+++ b/test/gmock-1.7.0/scripts/generator/cpp/__init__.py
--- a/test/gmock-1.7.0/scripts/generator/cpp/ast.py
+++ b/test/gmock-1.7.0/scripts/generator/cpp/ast.py
--- a/test/gmock-1.7.0/scripts/generator/cpp/gmock_class.py
+++ b/test/gmock-1.7.0/scripts/generator/cpp/gmock_class.py