Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
libvirt
提交
4b234955
L
libvirt
项目概览
openeuler
/
libvirt
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
libvirt
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4b234955
编写于
5月 29, 2008
作者:
D
Daniel P. Berrange
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Convert test suites over to new test infrastructure
上级
b0bcffda
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
97 addition
and
57 deletion
+97
-57
ChangeLog
ChangeLog
+10
-0
tests/nodeinfotest.c
tests/nodeinfotest.c
+16
-12
tests/qemuxml2argvtest.c
tests/qemuxml2argvtest.c
+10
-6
tests/qemuxml2xmltest.c
tests/qemuxml2xmltest.c
+8
-5
tests/qparamtest.c
tests/qparamtest.c
+7
-3
tests/sexpr2xmltest.c
tests/sexpr2xmltest.c
+8
-5
tests/statstest.c
tests/statstest.c
+7
-4
tests/xencapstest.c
tests/xencapstest.c
+18
-14
tests/xmconfigtest.c
tests/xmconfigtest.c
+7
-4
tests/xml2sexprtest.c
tests/xml2sexprtest.c
+6
-4
未找到文件。
ChangeLog
浏览文件 @
4b234955
Thu May 29 11:29:00 EST 2008 Daniel P. Berrange <berrange@redhat.com>
* tests/nodeinfotest.c, tests/qemuxml2argvtest.c,
tests/qemuxml2xmltest.c, tests/qparamtest.c,
tests/sexpr2xmltest.c, tests/statstest.c,
tests/xencapstest.c, tests/xmconfigtest.c,
tests/xml2sexprtest.c: Convert over to new test suite
infrastructure to enable OOM testing. Avoid use of
the abs_top_srcdir variable in favour of abs_srcdir
Thu May 29 11:23:00 EST 2008 Daniel P. Berrange <berrange@redhat.com>
Misc memory handling / cleanup fixes
...
...
tests/nodeinfotest.c
浏览文件 @
4b234955
...
...
@@ -3,13 +3,14 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include "testutils.h"
#include "internal.h"
#include "nodeinfo.h"
static
char
*
progname
;
static
char
*
abs_
top_
srcdir
;
static
char
*
abs_srcdir
;
#define MAX_FILE 4096
...
...
@@ -56,17 +57,17 @@ static int linuxTestCompareFiles(const char *cpuinfofile, const char *outputfile
static
int
linuxTestNodeInfo
(
const
void
*
data
)
{
char
cpuinfo
[
PATH_MAX
];
char
output
[
PATH_MAX
];
snprintf
(
cpuinfo
,
PATH_MAX
,
"%s/
tests/
nodeinfodata/linux-%s.cpuinfo"
,
abs_
top_
srcdir
,
(
const
char
*
)
data
);
snprintf
(
output
,
PATH_MAX
,
"%s/
tests/
nodeinfodata/linux-%s.txt"
,
abs_
top_
srcdir
,
(
const
char
*
)
data
);
snprintf
(
cpuinfo
,
PATH_MAX
,
"%s/nodeinfodata/linux-%s.cpuinfo"
,
abs_srcdir
,
(
const
char
*
)
data
);
snprintf
(
output
,
PATH_MAX
,
"%s/nodeinfodata/linux-%s.txt"
,
abs_srcdir
,
(
const
char
*
)
data
);
return
linuxTestCompareFiles
(
cpuinfo
,
output
);
}
#endif
int
main
(
int
argc
,
char
**
argv
)
static
int
m
ym
ain
(
int
argc
,
char
**
argv
)
{
int
ret
=
0
;
#ifdef __linux__
...
...
@@ -79,16 +80,17 @@ main(int argc, char **argv)
"nodeinfo-5"
,
"nodeinfo-6"
,
};
char
cwd
[
PATH_MAX
];
abs_
top_srcdir
=
getenv
(
"abs_top
_srcdir"
);
if
(
!
abs_
top_
srcdir
)
return
EXIT_FAILURE
;
abs_
srcdir
=
getenv
(
"abs
_srcdir"
);
if
(
!
abs_srcdir
)
abs_srcdir
=
getcwd
(
cwd
,
sizeof
(
cwd
))
;
progname
=
argv
[
0
];
if
(
argc
>
1
)
{
fprintf
(
stderr
,
"Usage: %s
\n
"
,
progname
);
exit
(
EXIT_FAILURE
);
return
(
EXIT_FAILURE
);
}
virInitialize
();
...
...
@@ -98,5 +100,7 @@ main(int argc, char **argv)
ret
=
-
1
;
#endif
exit
(
ret
==
0
?
EXIT_SUCCESS
:
EXIT_FAILURE
);
return
(
ret
==
0
?
EXIT_SUCCESS
:
EXIT_FAILURE
);
}
VIRT_TEST_MAIN
(
mymain
)
tests/qemuxml2argvtest.c
浏览文件 @
4b234955
...
...
@@ -43,6 +43,7 @@ static int testCompareXMLToArgvFiles(const char *xml, const char *cmd, int extra
if
(
!
(
vmdef
=
qemudParseVMDef
(
NULL
,
&
driver
,
xmlData
,
"test"
)))
goto
fail
;
memset
(
&
vm
,
0
,
sizeof
vm
);
vm
.
def
=
vmdef
;
vm
.
pid
=
-
1
;
vm
.
id
=
-
1
;
...
...
@@ -115,8 +116,8 @@ static int testCompareXMLToArgvHelper(const void *data) {
int
main
(
int
argc
,
char
**
argv
)
static
int
m
ym
ain
(
int
argc
,
char
**
argv
)
{
int
ret
=
0
;
char
cwd
[
PATH_MAX
];
...
...
@@ -125,14 +126,15 @@ main(int argc, char **argv)
if
(
argc
>
1
)
{
fprintf
(
stderr
,
"Usage: %s
\n
"
,
progname
);
exit
(
EXIT_FAILURE
);
return
(
EXIT_FAILURE
);
}
abs_srcdir
=
getenv
(
"abs_srcdir"
);
if
(
!
abs_srcdir
)
abs_srcdir
=
getcwd
(
cwd
,
sizeof
(
cwd
));
driver
.
caps
=
testQemuCapsInit
();
if
((
driver
.
caps
=
testQemuCapsInit
())
==
NULL
)
return
EXIT_FAILURE
;
#define DO_TEST(name, extraFlags) \
do { \
...
...
@@ -181,11 +183,13 @@ main(int argc, char **argv)
virCapabilitiesFree
(
driver
.
caps
);
exit
(
ret
==
0
?
EXIT_SUCCESS
:
EXIT_FAILURE
);
return
(
ret
==
0
?
EXIT_SUCCESS
:
EXIT_FAILURE
);
}
VIRT_TEST_MAIN
(
mymain
)
#else
int
main
(
void
)
{
exit
(
77
);
/* means 'test skipped' for automake */
}
int
main
(
void
)
{
return
(
77
);
/* means 'test skipped' for automake */
}
#endif
/* WITH_QEMU */
tests/qemuxml2xmltest.c
浏览文件 @
4b234955
...
...
@@ -70,8 +70,8 @@ static int testCompareXMLToXMLHelper(const void *data) {
}
int
main
(
int
argc
,
char
**
argv
)
static
int
m
ym
ain
(
int
argc
,
char
**
argv
)
{
int
ret
=
0
;
char
cwd
[
PATH_MAX
];
...
...
@@ -80,14 +80,15 @@ main(int argc, char **argv)
if
(
argc
>
1
)
{
fprintf
(
stderr
,
"Usage: %s
\n
"
,
progname
);
exit
(
EXIT_FAILURE
);
return
(
EXIT_FAILURE
);
}
abs_srcdir
=
getenv
(
"abs_srcdir"
);
if
(
!
abs_srcdir
)
abs_srcdir
=
getcwd
(
cwd
,
sizeof
(
cwd
));
driver
.
caps
=
testQemuCapsInit
();
if
((
driver
.
caps
=
testQemuCapsInit
())
==
NULL
)
return
(
EXIT_FAILURE
);
#define DO_TEST(name) \
if (virtTestRun("QEMU XML-2-XML " name, \
...
...
@@ -129,9 +130,11 @@ main(int argc, char **argv)
virCapabilitiesFree
(
driver
.
caps
);
exit
(
ret
==
0
?
EXIT_SUCCESS
:
EXIT_FAILURE
);
return
(
ret
==
0
?
EXIT_SUCCESS
:
EXIT_FAILURE
);
}
VIRT_TEST_MAIN
(
mymain
)
#else
int
main
(
void
)
{
exit
(
77
);
/* means 'test skipped' to automake */
}
...
...
tests/qparamtest.c
浏览文件 @
4b234955
...
...
@@ -8,6 +8,7 @@
#include "testutils.h"
#include "qparams.h"
#include "util.h"
#include "memory.h"
struct
qparamParseDataEntry
{
const
char
*
name
;
...
...
@@ -181,8 +182,9 @@ static const struct qparamParseDataEntry const params4[] = { { "foo", "" } };
static
const
struct
qparamParseDataEntry
const
params5
[]
=
{
{
"foo"
,
"one two"
}
};
static
const
struct
qparamParseDataEntry
const
params6
[]
=
{
{
"foo"
,
"one"
}
};
int
main
(
void
)
static
int
mymain
(
int
argc
ATTRIBUTE_UNUSED
,
char
**
argv
ATTRIBUTE_UNUSED
)
{
int
ret
=
0
;
...
...
@@ -221,5 +223,7 @@ main(void)
if
(
virtTestRun
(
"Add vargs"
,
1
,
qparamTestAddVargs
,
NULL
)
<
0
)
ret
=
-
1
;
exit
(
ret
==
0
?
EXIT_SUCCESS
:
EXIT_FAILURE
);
return
(
ret
==
0
?
EXIT_SUCCESS
:
EXIT_FAILURE
);
}
VIRT_TEST_MAIN
(
mymain
)
tests/sexpr2xmltest.c
浏览文件 @
4b234955
...
...
@@ -69,8 +69,8 @@ static int testCompareHelper(const void *data) {
}
int
main
(
int
argc
,
char
**
argv
)
static
int
m
ym
ain
(
int
argc
,
char
**
argv
)
{
int
ret
=
0
;
char
cwd
[
PATH_MAX
];
...
...
@@ -79,7 +79,7 @@ main(int argc, char **argv)
if
(
argc
>
1
)
{
fprintf
(
stderr
,
"Usage: %s
\n
"
,
progname
);
exit
(
EXIT_FAILURE
);
return
(
EXIT_FAILURE
);
}
abs_srcdir
=
getenv
(
"abs_srcdir"
);
...
...
@@ -88,7 +88,7 @@ main(int argc, char **argv)
if
(
argc
>
1
)
{
fprintf
(
stderr
,
"Usage: %s
\n
"
,
progname
);
exit
(
EXIT_FAILURE
);
return
(
EXIT_FAILURE
);
}
#define DO_TEST(in, out, version) \
...
...
@@ -139,8 +139,11 @@ main(int argc, char **argv)
DO_TEST
(
"fv-sound"
,
"fv-sound"
,
1
);
DO_TEST
(
"fv-sound-all"
,
"fv-sound-all"
,
1
);
exit
(
ret
==
0
?
EXIT_SUCCESS
:
EXIT_FAILURE
);
return
(
ret
==
0
?
EXIT_SUCCESS
:
EXIT_FAILURE
);
}
VIRT_TEST_MAIN
(
mymain
)
#else
/* WITHOUT_XEN */
int
main
(
void
)
...
...
tests/statstest.c
浏览文件 @
4b234955
...
...
@@ -45,8 +45,9 @@ static int testDeviceHelper(const void *data)
#endif
int
main
(
void
)
static
int
mymain
(
int
argc
ATTRIBUTE_UNUSED
,
char
**
argv
ATTRIBUTE_UNUSED
)
{
int
ret
=
0
;
#if __linux__ && WITH_XEN
...
...
@@ -54,7 +55,7 @@ main(void)
* register a handler to stop error messages cluttering
* up display
*/
if
(
!
getenv
(
"
DEBUG_TESTS
"
))
if
(
!
getenv
(
"
VIR_TEST_DEBUG
"
))
virSetErrorFunc
(
NULL
,
testQuietError
);
#define DO_TEST(dev, num) \
...
...
@@ -177,5 +178,7 @@ main(void)
DO_TEST
(
"/dev/xvda15"
,
51727
);
#endif
exit
(
ret
==
0
?
EXIT_SUCCESS
:
EXIT_FAILURE
);
return
(
ret
==
0
?
EXIT_SUCCESS
:
EXIT_FAILURE
);
}
VIRT_TEST_MAIN
(
mymain
)
tests/xencapstest.c
浏览文件 @
4b234955
...
...
@@ -3,6 +3,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#ifdef WITH_XEN
...
...
@@ -12,7 +13,7 @@
#include "xen_internal.h"
static
char
*
progname
;
static
char
*
abs_
top_
srcdir
;
static
char
*
abs_srcdir
;
#define MAX_FILE 4096
...
...
@@ -31,12 +32,12 @@ static int testCompareFiles(const char *hostmachine,
char
cpuinfo
[
PATH_MAX
];
char
capabilities
[
PATH_MAX
];
snprintf
(
xml
,
sizeof
xml
-
1
,
"%s/
tests/
%s"
,
abs_
top_
srcdir
,
xml_rel
);
snprintf
(
cpuinfo
,
sizeof
cpuinfo
-
1
,
"%s/
tests/
%s"
,
abs_
top_
srcdir
,
cpuinfo_rel
);
snprintf
(
capabilities
,
sizeof
capabilities
-
1
,
"%s/
tests/
%s"
,
abs_
top_
srcdir
,
capabilities_rel
);
snprintf
(
xml
,
sizeof
xml
-
1
,
"%s/%s"
,
abs_srcdir
,
xml_rel
);
snprintf
(
cpuinfo
,
sizeof
cpuinfo
-
1
,
"%s/%s"
,
abs_srcdir
,
cpuinfo_rel
);
snprintf
(
capabilities
,
sizeof
capabilities
-
1
,
"%s/%s"
,
abs_srcdir
,
capabilities_rel
);
if
(
virtTestLoadFile
(
xml
,
&
expectxml
,
MAX_FILE
)
<
0
)
goto
fail
;
...
...
@@ -147,21 +148,22 @@ static int testXenppc64(const void *data ATTRIBUTE_UNUSED) {
}
int
main
(
int
argc
,
char
**
argv
)
static
int
m
ym
ain
(
int
argc
,
char
**
argv
)
{
int
ret
=
0
;
char
cwd
[
PATH_MAX
];
progname
=
argv
[
0
];
if
(
argc
>
1
)
{
fprintf
(
stderr
,
"Usage: %s
\n
"
,
progname
);
exit
(
EXIT_FAILURE
);
return
(
EXIT_FAILURE
);
}
abs_
top_srcdir
=
getenv
(
"abs_top
_srcdir"
);
if
(
!
abs_
top_
srcdir
)
return
1
;
abs_
srcdir
=
getenv
(
"abs
_srcdir"
);
if
(
!
abs_srcdir
)
abs_srcdir
=
getcwd
(
cwd
,
sizeof
(
cwd
))
;
virInitialize
();
...
...
@@ -213,9 +215,11 @@ main(int argc, char **argv)
ret
=
-
1
;
exit
(
ret
==
0
?
EXIT_SUCCESS
:
EXIT_FAILURE
);
return
(
ret
==
0
?
EXIT_SUCCESS
:
EXIT_FAILURE
);
}
VIRT_TEST_MAIN
(
mymain
)
#else
/* !WITH_XEN */
int
...
...
tests/xmconfigtest.c
浏览文件 @
4b234955
...
...
@@ -170,8 +170,8 @@ static int testCompareHelper(const void *data) {
}
int
main
(
int
argc
,
char
**
argv
)
static
int
m
ym
ain
(
int
argc
,
char
**
argv
)
{
int
ret
=
0
;
char
cwd
[
PATH_MAX
];
...
...
@@ -180,7 +180,7 @@ main(int argc, char **argv)
if
(
argc
>
1
)
{
fprintf
(
stderr
,
"Usage: %s
\n
"
,
progname
);
exit
(
EXIT_FAILURE
);
return
(
EXIT_FAILURE
);
}
abs_srcdir
=
getenv
(
"abs_srcdir"
);
...
...
@@ -223,8 +223,11 @@ main(int argc, char **argv)
DO_TEST
(
"fullvirt-sound"
,
2
);
exit
(
ret
==
0
?
EXIT_SUCCESS
:
EXIT_FAILURE
);
return
(
ret
==
0
?
EXIT_SUCCESS
:
EXIT_FAILURE
);
}
VIRT_TEST_MAIN
(
mymain
)
#else
/* WITHOUT_XEN */
int
main
(
void
)
...
...
tests/xml2sexprtest.c
浏览文件 @
4b234955
...
...
@@ -77,8 +77,8 @@ static int testCompareHelper(const void *data) {
}
int
main
(
int
argc
,
char
**
argv
)
static
int
m
ym
ain
(
int
argc
,
char
**
argv
)
{
int
ret
=
0
;
char
cwd
[
PATH_MAX
];
...
...
@@ -91,7 +91,7 @@ main(int argc, char **argv)
if
(
argc
>
1
)
{
fprintf
(
stderr
,
"Usage: %s
\n
"
,
progname
);
exit
(
EXIT_FAILURE
);
return
(
EXIT_FAILURE
);
}
#define DO_TEST(in, out, name, version) \
...
...
@@ -145,9 +145,11 @@ main(int argc, char **argv)
DO_TEST
(
"fv-sound"
,
"fv-sound"
,
"fvtest"
,
1
);
exit
(
ret
==
0
?
EXIT_SUCCESS
:
EXIT_FAILURE
);
return
(
ret
==
0
?
EXIT_SUCCESS
:
EXIT_FAILURE
);
}
VIRT_TEST_MAIN
(
mymain
)
#else
/* WITH_XEN */
int
main
(
void
)
{
exit
(
77
);
/* means 'test skipped' for automake */
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录