External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-03 11:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: utils: Allow NULL strings to be equal to empty file in virTestCompareToFile

Browse Source 
Treat an NULL string equivalent to an empty string in
virTestCompareToFile so that callers don't need to add additional logic
in case when a test produces no output.
This commit is contained in:
Peter Krempa 2017-07-28 12:37:48 +02:00
parent 259a16d514
commit 8b3a0b28ba
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/testutils.c
View File

@ -777,6 +777,8 @@ int virTestDifferenceBin(FILE *stream,
/* /*
* @param strcontent: String input content * @param strcontent: String input content
* @param filename: File to compare strcontent against * @param filename: File to compare strcontent against
*
* If @strcontent is NULL, it's treated as an empty string.
*/ */
int int
virTestCompareToFile(const char *strcontent, virTestCompareToFile(const char *strcontent,
@ -787,6 +789,9 @@ virTestCompareToFile(const char *strcontent,
char *fixedcontent = NULL; char *fixedcontent = NULL;
const char *cmpcontent = strcontent; const char *cmpcontent = strcontent;
if (!cmpcontent)
cmpcontent = "";
if (virTestLoadFile(filename, &filecontent) < 0 && !virTestGetRegenerate()) if (virTestLoadFile(filename, &filecontent) < 0 && !virTestGetRegenerate())
goto failure; goto failure;