External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-21 20:15:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Rename virtTestCaptureProgramOutput to virTestCaptureProgramOutput.

Browse Source 
This function doesn't follow our convention of naming functions.
This commit is contained in:
Tomáš Ryšavý 2016-05-26 17:02:05 +02:00 committed by John Ferlan
parent 65979e5b62
commit 75f7309468
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/testutils.c
View File

@ -396,7 +396,7 @@ void virTestCaptureProgramExecChild(const char *const argv[],
}
int
virtTestCaptureProgramOutput(const char *const argv[], char **buf, int maxlen)
virTestCaptureProgramOutput(const char *const argv[], char **buf, int maxlen)
{
int pipefd[2];
int len;
@ -428,9 +428,9 @@ virtTestCaptureProgramOutput(const char *const argv[], char **buf, int maxlen)
}
#else /* !WIN32 */
int
virtTestCaptureProgramOutput(const char *const argv[] ATTRIBUTE_UNUSED,
char **buf ATTRIBUTE_UNUSED,
int maxlen ATTRIBUTE_UNUSED)
virTestCaptureProgramOutput(const char *const argv[] ATTRIBUTE_UNUSED,
char **buf ATTRIBUTE_UNUSED,
int maxlen ATTRIBUTE_UNUSED)
{
return -1;
}

2
tests/testutils.h
View File

@ -52,7 +52,7 @@ int virTestRun(const char *title,
int (*body)(const void *data),
const void *data);
int virTestLoadFile(const char *file, char **buf);
int virtTestCaptureProgramOutput(const char *const argv[], char **buf, int maxlen);
int virTestCaptureProgramOutput(const char *const argv[], char **buf, int maxlen);
void virTestClearCommandPath(char *cmdset);

2
tests/virshtest.c
View File

@ -65,7 +65,7 @@ testCompareOutputLit(const char *expectData,
int result = -1;
char *actualData = NULL;
if (virtTestCaptureProgramOutput(argv, &actualData, 4096) < 0)
if (virTestCaptureProgramOutput(argv, &actualData, 4096) < 0)
goto cleanup;
if (filter && testFilterLine(actualData, filter) < 0)