infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-06 14:10:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

8014068: TEST_BUG: compiler/ciReplay/TestSA.sh fails on Windows: core wasn't generated

Browse Source 
Reviewed-by: kvn
This commit is contained in:
Igor Ignatyev 2013-05-15 22:44:52 +04:00
parent 2ed62e808c
commit bf1380cc77
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hotspot/test/compiler/ciReplay/TestSA.sh
View File

@ -77,10 +77,11 @@ then
"replay data wasn't generated by SA"
fi
diff --brief ${replay_data} replay_vm.txt
if [ $? -ne 0 ]
diff ${replay_data} replay_vm.txt > replay.diff 2>&1
if [ -s replay.diff ]
then
echo WARNING: replay.txt from SA != replay.txt from VM
echo WARNING: replay.txt from SA != replay.txt from VM:
cat replay.diff
fi
common_tests 10

26
hotspot/test/compiler/ciReplay/common.sh
View File

@ -182,8 +182,11 @@ echo "is_tiered=$is_tiered"
# crash vm in compiler thread with generation replay data and 'small' dump-file
# $@ - additional vm opts
generate_replay() {
# enable core dump
ulimit -c unlimited
if [ $VM_OS != "windows" ]
then
# enable core dump
ulimit -c unlimited
fi
cmd="${JAVA} ${TESTVMOPTS} $@ \
-Xms8m \
@ -206,29 +209,24 @@ generate_replay() {
echo GENERATION OF REPLAY.TXT:
echo $cmd
${cmd} 2>&1 > crash.out
${cmd} > crash.out 2>&1
core_locations=`grep -i core crash.out | grep "location:" | \
sed -e 's/.*location: //'`
rm crash.out
# processing core locations for *nix
if [ $OS != "windows" ]
if [ $VM_OS != "windows" ]
then
# remove 'or' between '/core.<pid>' and 'core'
core_locations=`echo $core_locations | \
sed -e 's/\([^ ]*\) or \([^ ]*\)/\1 \2/'`
# add <core_path>/core.<pid> core.<pid>
core=`echo $core_locations | awk '{print $1}'`
dir=`dirname $core`
core=`basename $core`
if [ -n ${core} ]
core_with_dir=`echo $core_locations | awk '{print $1}'`
dir=`dirname $core_with_dir`
core_with_pid=`echo $core_locations | awk '{print $2}'`
if [ -n ${core_with_pid} ]
then
core_locations="$core_locations $dir${FS}$core"
fi
core=`echo $core_locations | awk '{print $2}'`
if [ -n ${core} ]
then
core_locations="$core_locations $dir${FS}$core"
core_locations="$core_locations $dir${FS}$core_with_pid $core_with_pid"
fi
fi