luo980/glog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows has the fc utility to compare files instead of diff

Browse Source
This commit is contained in:
Artem Dinaburg 2016-03-18 14:34:24 -04:00 committed by NeroBurner
parent 62c3e3cd56
commit b54793d232
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/googletest.h
View File

@ -489,7 +489,11 @@ static inline bool MungeAndDiffTestStderr(const string& golden_filename) {
WriteToFile(golden, munged_golden); WriteToFile(golden, munged_golden);
string munged_captured = cap->filename() + ".munged"; string munged_captured = cap->filename() + ".munged";
WriteToFile(captured, munged_captured); WriteToFile(captured, munged_captured);
#ifdef OS_WINDOWS
string diffcmd("fc " + munged_golden + " " + munged_captured);
#else
string diffcmd("diff -u " + munged_golden + " " + munged_captured); string diffcmd("diff -u " + munged_golden + " " + munged_captured);
#endif
if (system(diffcmd.c_str()) != 0) { if (system(diffcmd.c_str()) != 0) {
fprintf(stderr, "diff command was failed.\n"); fprintf(stderr, "diff command was failed.\n");
} }