提交 75f73094 编写于 作者: T Tomáš Ryšavý 提交者: John Ferlan

tests: Rename virtTestCaptureProgramOutput to virTestCaptureProgramOutput.

This function doesn't follow our convention of naming functions.
上级 65979e5b
...@@ -396,7 +396,7 @@ void virTestCaptureProgramExecChild(const char *const argv[], ...@@ -396,7 +396,7 @@ void virTestCaptureProgramExecChild(const char *const argv[],
} }
int int
virtTestCaptureProgramOutput(const char *const argv[], char **buf, int maxlen) virTestCaptureProgramOutput(const char *const argv[], char **buf, int maxlen)
{ {
int pipefd[2]; int pipefd[2];
int len; int len;
...@@ -428,9 +428,9 @@ virtTestCaptureProgramOutput(const char *const argv[], char **buf, int maxlen) ...@@ -428,9 +428,9 @@ virtTestCaptureProgramOutput(const char *const argv[], char **buf, int maxlen)
} }
#else /* !WIN32 */ #else /* !WIN32 */
int int
virtTestCaptureProgramOutput(const char *const argv[] ATTRIBUTE_UNUSED, virTestCaptureProgramOutput(const char *const argv[] ATTRIBUTE_UNUSED,
char **buf ATTRIBUTE_UNUSED, char **buf ATTRIBUTE_UNUSED,
int maxlen ATTRIBUTE_UNUSED) int maxlen ATTRIBUTE_UNUSED)
{ {
return -1; return -1;
} }
......
...@@ -52,7 +52,7 @@ int virTestRun(const char *title, ...@@ -52,7 +52,7 @@ int virTestRun(const char *title,
int (*body)(const void *data), int (*body)(const void *data),
const void *data); const void *data);
int virTestLoadFile(const char *file, char **buf); 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); void virTestClearCommandPath(char *cmdset);
......
...@@ -65,7 +65,7 @@ testCompareOutputLit(const char *expectData, ...@@ -65,7 +65,7 @@ testCompareOutputLit(const char *expectData,
int result = -1; int result = -1;
char *actualData = NULL; char *actualData = NULL;
if (virtTestCaptureProgramOutput(argv, &actualData, 4096) < 0) if (virTestCaptureProgramOutput(argv, &actualData, 4096) < 0)
goto cleanup; goto cleanup;
if (filter && testFilterLine(actualData, filter) < 0) if (filter && testFilterLine(actualData, filter) < 0)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册