aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/generator
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2009-06-04 05:48:20 +0000
committerzhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386>2009-06-04 05:48:20 +0000
commitb82431625d1842d1498f3c0e6f1923ce81837c6e (patch)
tree3d89cbedefd32bf7b2fc76fdf4e0312c206bb0a0 /scripts/generator
parentc2ad46a5df4414fc2b804c53525f4578f01a3dfe (diff)
downloadgoogletest-b82431625d1842d1498f3c0e6f1923ce81837c6e.tar.gz
googletest-b82431625d1842d1498f3c0e6f1923ce81837c6e.tar.bz2
googletest-b82431625d1842d1498f3c0e6f1923ce81837c6e.zip
Makes all container matchers work with (possibly multi-dimensional) native arrays; makes Contains() accept a matcher; adds Value(x, m); improves gmock doctor to diagnose the Type in Template Base disease.
Diffstat (limited to 'scripts/generator')
-rw-r--r--scripts/generator/README2
-rwxr-xr-xscripts/generator/cpp/gmock_class_test.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/generator/README b/scripts/generator/README
index 071bf0fb..d6f95974 100644
--- a/scripts/generator/README
+++ b/scripts/generator/README
@@ -23,7 +23,7 @@ the environment. For example to use an indent of 4 spaces:
INDENT=4 gmock_gen.py header-file.h ClassName
-This version was made from SVN revision 279 in the cppclean repository.
+This version was made from SVN revision 281 in the cppclean repository.
Known Limitations
-----------------
diff --git a/scripts/generator/cpp/gmock_class_test.py b/scripts/generator/cpp/gmock_class_test.py
index 0132eef4..ae00800f 100755
--- a/scripts/generator/cpp/gmock_class_test.py
+++ b/scripts/generator/cpp/gmock_class_test.py
@@ -25,7 +25,7 @@ import sys
import unittest
# Allow the cpp imports below to work when run as a standalone script.
-sys.path.append(os.path.dirname(os.path.dirname(__file__)))
+sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
from cpp import ast
from cpp import gmock_class