diff options
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | googlemock/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | googlemock/scripts/gmock_doctor.py | 14 | ||||
| -rw-r--r-- | googletest/xcode/gtest.xcodeproj/project.pbxproj | 8 |
4 files changed, 13 insertions, 17 deletions
@@ -57,7 +57,7 @@ the following notable projects: ## Related Open Source Projects ## -[Google Test UI](http://code.google.com/p/gtest-gbar/) is test runner that runs +[Google Test UI](https://github.com/ospector/gtest-gbar) is test runner that runs your test binary, allows you to track its progress via a progress bar, and displays a list of test failures. Clicking on one shows failure text. Google Test UI is written in C#. @@ -102,10 +102,6 @@ package (as described below): * Mac OS X v10.4 Tiger or newer * XCode Developer Tools -Also, you'll need [CMake](http://www.cmake.org/) v2.6.4 or higher if -you want to build the samples using the provided CMake script, regardless -of the platform. - ### Requirements for Contributors ### We welcome patches. If you plan to contribute a patch, you need to diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt index 4cc6637..cd52277 100644 --- a/googlemock/CMakeLists.txt +++ b/googlemock/CMakeLists.txt @@ -15,7 +15,7 @@ option(gmock_build_tests "Build all of Google Mock's own tests." OFF) if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/gtest/CMakeLists.txt") set(gtest_dir gtest) else() - set(gtest_dir ../gtest) + set(gtest_dir ../googletest) endif() # Defines pre_project_set_up_hermetic_build() and set_up_hermetic_build(). diff --git a/googlemock/scripts/gmock_doctor.py b/googlemock/scripts/gmock_doctor.py index 9ac4653..74992bc 100755 --- a/googlemock/scripts/gmock_doctor.py +++ b/googlemock/scripts/gmock_doctor.py @@ -599,7 +599,7 @@ def main(): print ('Please copy and paste the compiler errors here. Press c-D when ' 'you are done:') else: - print 'Waiting for compiler errors on stdin . . .' + print ('Waiting for compiler errors on stdin . . .') msg = sys.stdin.read().strip() diagnoses = Diagnose(msg) @@ -617,18 +617,18 @@ If you send your source code and the compiler's error messages to %s, you can be helped and I can get smarter -- win-win for us!""" % (msg, _EMAIL)) else: - print '------------------------------------------------------------' - print 'Your code appears to have the following', + print ('------------------------------------------------------------') + print ('Your code appears to have the following',) if count > 1: - print '%s diseases:' % (count,) + print ('%s diseases:' % (count,)) else: - print 'disease:' + print ('disease:') i = 0 for d in diagnoses: i += 1 if count > 1: - print '\n#%s:' % (i,) - print d + print ('\n#%s:' % (i,)) + print (d) print (""" How did I do? If you think I'm wrong or unhelpful, please send your source code and the compiler's error messages to %s. diff --git a/googletest/xcode/gtest.xcodeproj/project.pbxproj b/googletest/xcode/gtest.xcodeproj/project.pbxproj index 0452a63..aefaa88 100644 --- a/googletest/xcode/gtest.xcodeproj/project.pbxproj +++ b/googletest/xcode/gtest.xcodeproj/project.pbxproj @@ -46,7 +46,7 @@ 4048843B0E2F799B00CF7658 /* gtest.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883DE0E2F799B00CF7658 /* gtest.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4048843C0E2F799B00CF7658 /* gtest_pred_impl.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883DF0E2F799B00CF7658 /* gtest_pred_impl.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4048843D0E2F799B00CF7658 /* gtest_prod.h in Headers */ = {isa = PBXBuildFile; fileRef = 404883E00E2F799B00CF7658 /* gtest_prod.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 404884500E2F799B00CF7658 /* README in Resources */ = {isa = PBXBuildFile; fileRef = 404883F60E2F799B00CF7658 /* README */; }; + 404884500E2F799B00CF7658 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 404883F60E2F799B00CF7658 /* README.md */; }; 404884A00E2F7BE600CF7658 /* gtest-death-test-internal.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 404883E20E2F799B00CF7658 /* gtest-death-test-internal.h */; }; 404884A10E2F7BE600CF7658 /* gtest-filepath.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 404883E30E2F799B00CF7658 /* gtest-filepath.h */; }; 404884A20E2F7BE600CF7658 /* gtest-internal.h in Copy Headers Internal */ = {isa = PBXBuildFile; fileRef = 404883E40E2F799B00CF7658 /* gtest-internal.h */; }; @@ -217,7 +217,7 @@ 404883E40E2F799B00CF7658 /* gtest-internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-internal.h"; sourceTree = "<group>"; }; 404883E50E2F799B00CF7658 /* gtest-port.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-port.h"; sourceTree = "<group>"; }; 404883E60E2F799B00CF7658 /* gtest-string.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "gtest-string.h"; sourceTree = "<group>"; }; - 404883F60E2F799B00CF7658 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = README; path = ../README; sourceTree = SOURCE_ROOT; }; + 404883F60E2F799B00CF7658 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = README.md; path = ../README.md; sourceTree = SOURCE_ROOT; }; 4048840D0E2F799B00CF7658 /* gtest_main.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gtest_main.cc; sourceTree = "<group>"; }; 404884A90E2F7CD900CF7658 /* CHANGES */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CHANGES; path = ../CHANGES; sourceTree = SOURCE_ROOT; }; 404884AA0E2F7CD900CF7658 /* CONTRIBUTORS */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CONTRIBUTORS; path = ../CONTRIBUTORS; sourceTree = SOURCE_ROOT; }; @@ -318,7 +318,7 @@ 404884A90E2F7CD900CF7658 /* CHANGES */, 404884AA0E2F7CD900CF7658 /* CONTRIBUTORS */, 404884AB0E2F7CD900CF7658 /* LICENSE */, - 404883F60E2F799B00CF7658 /* README */, + 404883F60E2F799B00CF7658 /* README.md */, 404883D90E2F799B00CF7658 /* include */, 4089A02F0FFACF84000B29AE /* samples */, 404884070E2F799B00CF7658 /* src */, @@ -617,7 +617,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 404884500E2F799B00CF7658 /* README in Resources */, + 404884500E2F799B00CF7658 /* README.md in Resources */, 404884AC0E2F7CD900CF7658 /* CHANGES in Resources */, 404884AD0E2F7CD900CF7658 /* CONTRIBUTORS in Resources */, 404884AE0E2F7CD900CF7658 /* LICENSE in Resources */, |