Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
tp-qemu
提交
59526ff4
T
tp-qemu
项目概览
openeuler
/
tp-qemu
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
tp-qemu
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
59526ff4
编写于
11月 18, 2016
作者:
S
suqinhuang
提交者:
GitHub
11月 18, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #813 from suqinhuang/winutils_letter
Remove set_winutils_letter from rng_bat
上级
573c445a
c0244737
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
10 addition
and
19 deletion
+10
-19
qemu/tests/cfg/rng_bat.cfg
qemu/tests/cfg/rng_bat.cfg
+3
-3
qemu/tests/rng_bat.py
qemu/tests/rng_bat.py
+7
-16
未找到文件。
qemu/tests/cfg/rng_bat.cfg
浏览文件 @
59526ff4
...
...
@@ -8,11 +8,11 @@
# Please update path of rng_dll_register_cmd to right path which included you driver
#rng_dll_register_cmd = if not exist "C:\Windows\system32\viorngum.dll" copy PATH:\INCLUDEDRIVER\viorngum.dll C:\Windows\system32\ /y &&"
session_cmd_timeout = 240
read_rng_cmd = "
X
:\random_%PROCESSOR_ARCHITECTURE%.exe"
read_rng_cmd = "
WIN_UTILS
:\random_%PROCESSOR_ARCHITECTURE%.exe"
driver_name = "viorng"
rng_data_rex = "0x\w"
driver_id_cmd =
X:\devcon\wxp_x86\devcon.exe find * | find "VirtIO"
driver_check_cmd =
X:\devcon\wxp_x86\devcon.exe status @DRIVER_ID
driver_id_cmd =
'WIN_UTILS:\devcon\wxp_x86\devcon.exe find * | find "VirtIO"'
driver_check_cmd =
"WIN_UTILS:\devcon\wxp_x86\devcon.exe status @DRIVER_ID"
driver_id_pattern = "(.*?):.*?VirtIO RNG Device"
Linux:
session_cmd_timeout = 360
...
...
qemu/tests/rng_bat.py
浏览文件 @
59526ff4
...
...
@@ -36,16 +36,6 @@ def run(test, params, env):
output
=
process
.
system_output
(
lsof_cmd
,
ignore_status
=
True
)
return
re
.
search
(
r
"\s+%s\s+"
%
vm_pid
,
output
,
re
.
M
)
def
set_winutils_letter
(
cmd
,
session
,
params
):
"""
Replace 'X:' in command to real cdrom drive letter.
"""
vol
=
"X:"
if
params
[
"os_type"
]
!=
"linux"
:
vol
=
utils_misc
.
get_winutils_vol
(
session
)
vol
=
"%s:"
%
vol
return
cmd
.
replace
(
"X:"
,
vol
)
def
check_driver_status
(
session
,
check_cmd
,
driver_id
):
"""
:param session: VM session
...
...
@@ -96,13 +86,13 @@ def run(test, params, env):
vm
,
timeout
)
error_context
.
context
(
"Check driver status"
,
logging
.
info
)
session
=
vm
.
wait_for_login
(
timeout
=
timeout
)
driver_id_cmd
=
set_winutils_letter
(
params
.
get
(
"driver_id_cmd"
),
session
,
params
)
driver_id_cmd
=
utils_misc
.
set_winutils_letter
(
session
,
params
[
"driver_id_cmd"
]
)
driver_id
=
get_driver_id
(
session
,
driver_id_cmd
,
params
[
"driver_id_pattern"
])
if
params
.
get
(
"driver_check_cmd"
):
driver_check_cmd
=
set_winutils_letter
(
params
.
get
(
"driver_check_cmd"
),
session
,
params
)
driver_check_cmd
=
utils_misc
.
set_winutils_letter
(
session
,
params
.
get
(
"driver_check_cmd"
)
)
check_driver_status
(
session
,
driver_check_cmd
,
driver_id
)
else
:
error_context
.
context
(
"verify virtio-rng device driver"
,
logging
.
info
)
...
...
@@ -122,8 +112,9 @@ def run(test, params, env):
error_context
.
context
(
"Read virtio-rng device to get random number"
,
logging
.
info
)
read_rng_cmd
=
set_winutils_letter
(
params
.
get
(
"read_rng_cmd"
),
session
,
params
)
read_rng_cmd
=
utils_misc
.
set_winutils_letter
(
session
,
params
[
"read_rng_cmd"
])
if
rng_dll_register_cmd
:
logging
.
info
(
"register 'viorngum.dll' into system"
)
session
.
cmd
(
rng_dll_register_cmd
,
timeout
=
120
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录