diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ede6e7ad..7415eab3d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ enable_testing () set (GLOG_MAJOR_VERSION 0) set (GLOG_MINOR_VERSION 3) -set (GLOG_PATCH_VERSION 4) +set (GLOG_PATCH_VERSION 5) set (GLOG_VERSION ${GLOG_MAJOR_VERSION}.${GLOG_MINOR_VERSION}.${GLOG_PATCH_VERSION}) diff --git a/src/googletest.h b/src/googletest.h index b4677b276..2d318a712 100644 --- a/src/googletest.h +++ b/src/googletest.h @@ -484,9 +484,12 @@ static inline bool MungeAndDiffTestStderr(const string& golden_filename) { string munged_captured = cap->filename() + ".munged"; WriteToFile(captured, munged_captured); string diffcmd("diff -u " + munged_golden + " " + munged_captured); - if (system(diffcmd.c_str()) != 0) { - fprintf(stderr, "diff command was failed.\n"); - } + + fprintf(stderr, "diff command has been disabled in this glog fork.\n"); + + // if (system(diffcmd.c_str()) != 0) { + // fprintf(stderr, "diff command was failed.\n"); + // } unlink(munged_golden.c_str()); unlink(munged_captured.c_str()); return false;