Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_jdk
提交
3ee7b379
D
dragonwell8_jdk
项目概览
openanolis
/
dragonwell8_jdk
通知
4
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_jdk
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
3ee7b379
编写于
2月 15, 2016
作者:
K
kshefov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8038963: com/sun/jdi tests fail because cygwin's ps sometimes misses processes
Reviewed-by: coffeys
上级
dc3ef3c5
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
58 addition
and
75 deletion
+58
-75
test/com/sun/jdi/ShellScaffold.sh
test/com/sun/jdi/ShellScaffold.sh
+58
-75
未找到文件。
test/com/sun/jdi/ShellScaffold.sh
浏览文件 @
3ee7b379
...
...
@@ -195,30 +195,26 @@ killOrphans()
findPid
()
{
# Return 0 if $1 is the pid of a running process.
if
[
-z
"
$isWin98
"
]
;
then
if
[
"
$osname
"
=
SunOS
]
;
then
# Solaris and OpenSolaris use pgrep and not ps in psCmd
findPidCmd
=
"
$psCmd
"
elif
[
"
$osname
"
=
AIX
]
;
then
findPidCmd
=
"
$psCmd
"
else
case
"
$osname
"
in
SunOS
|
AIX
)
$psCmd
|
$grep
'^ *'
"
$1
"
>
$devnull
2>&1
res
=
$?
;;
Windows
*
|
CYGWIN
*
)
# Don't use ps on cygwin since it sometimes misses
# some processes (!).
tasklist /NH |
$grep
"
$1
"
>
$devnull
2>&1
res
=
$?
;;
*
)
# Never use plain 'ps', which requires a "controlling terminal"
# and will fail with a "ps: no controlling terminal" error.
# Running under 'rsh' will cause this ps error.
# cygwin ps puts an I in column 1 for some reason.
findPidCmd
=
"
$psCmd
-e"
fi
$findPidCmd
|
$grep
'^I* *'
"
$1
"
>
$devnull
2>&1
return
$?
fi
# mks 6.2a on win98 has $! getting a negative
# number and in ps, it shows up as 0x...
# Thus, we can't search in ps output for
# PIDs gotten via $!
# We don't know if it is running or not - assume it is.
# We don't really care about win98 anymore.
return
0
$psCmd
-e
|
$grep
'^ *'
"
$1
"
>
$devnull
2>&1
res
=
$?
;;
esac
return
$res
}
setup
()
...
...
@@ -248,17 +244,10 @@ setup()
ulimitCmd
=
osname
=
`
uname
-s
`
isWin98
=
isCygwin
=
case
"
$osname
"
in
Windows
*
|
CYGWIN
*
)
devnull
=
NUL
if
[
"
$osname
"
=
Windows_98
-o
"
$osname
"
=
Windows_ME
]
;
then
isWin98
=
1
debuggeeKeyword
=
'we_cant_kill_debuggees_on_win98'
jdbKeyword
=
'jdb\.exe'
fi
case
"
$osname
"
in
CYGWIN
*
)
isCygwin
=
1
...
...
@@ -743,7 +732,7 @@ waitForJdbMsg()
sleep
${
sleep_seconds
}
findPid
$topPid
if
[
$?
!=
0
]
;
then
# Top process is dead. We better die too
echo
"--Top process (
$topPid
) is dead. We better die too"
>
&2
dojstack
exit
1
fi
...
...
@@ -931,12 +920,6 @@ waitForFinish()
if
[
$?
!=
0
]
;
then
break
fi
if
[
!
-z
"
$isWin98
"
]
;
then
$psCmd
|
$grep
-i
'JDB\.EXE'
>
$devnull
2>&1
if
[
$?
!=
0
]
;
then
break
;
fi
fi
$grep
-s
'Input stream closed'
$jdbOutFile
>
$devnull
2>&1
if
[
$?
=
0
]
;
then
#something went wrong
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录