Updated to newer shenandoah sources, containing shenandoah GC. Added test for shenandaoh GC presence where expected

This commit is contained in:
Jiri Vanek 2018-07-09 17:29:05 +02:00
parent 58db6624a4
commit aac356d1a7
4 changed files with 21 additions and 3 deletions

1
.gitignore vendored
View File

@ -8,3 +8,4 @@
/icedtea8_9d464368e06d_systemtap-tapset_3.2.tar.xz
/systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
/shenandoah-jdk11-jdk-11+20.tar.xz
/shenandoah-jdk11-c435b8430811.tar.xz

View File

@ -73,6 +73,13 @@
%global include_debug_build 0
%endif
# On x86_64 and AArch64, we use the Shenandoah HotSpot
%ifarch x86_64 %{aarch64}
%global use_shenandoah_hotspot 1
%else
%global use_shenandoah_hotspot 0
%endif
%if %{include_debug_build}
%global build_loop2 %{debug_suffix}
%else
@ -871,7 +878,7 @@ URL: http://openjdk.java.net/
# to regenerate source0 (jdk) and source8 (jdk's taspets) run update_package.sh
# update_package.sh contains hard-coded repos, revisions, tags, and projects to regenerate the source archives
Source0: shenandoah-jdk%{majorver}-jdk-%{majorver}+%{buildver}.tar.xz
Source0: shenandoah-jdk%{majorver}-c435b8430811.tar.xz
Source8: systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz
# Desktop files. Adapted from IcedTea
@ -1342,6 +1349,11 @@ for suffix in %{rev_build_loop} ; do
export JAVA_HOME=$(pwd)/%{buildoutputdir -- $suffix}/images/%{jdkimage}
#check sheandoah is enabled
%if %{use_shenandoah_hotspot}
$JAVA_HOME//bin/java -XX:+UseShenandoahGC -version
%endif
# Check unlimited policy has been used
$JAVA_HOME/bin/javac -d . %{SOURCE13}
$JAVA_HOME/bin/java --add-opens java.base/javax.crypto=ALL-UNNAMED TestCryptoLevel

View File

@ -1,2 +1,2 @@
SHA512 (systemtap_3.2_tapsets_hg-icedtea8-9d464368e06d.tar.xz) = cf578221b77d8c7e019f69909bc86c419c5fb5e10bceba9592ff6e7f96887b0a7f07c9cefe90800975247a078785ca190fdec5c2d0f841bb447cee784b570f7d
SHA512 (shenandoah-jdk11-jdk-11+20.tar.xz) = 80d57061b0c62b8ce6796d63c9a1167012dfbbc5612dacf3c2955bdef07f93fad9b278d08476d82df27594053d92175017a24c6e8ab97b62498e1b88c81d6f17
SHA512 (shenandoah-jdk11-c435b8430811.tar.xz) = c3956e3e970eeff94c8c4690e0550ab186d8ca814bef10d54f4428762c4e9faac15aa46cdd4b3757afc7cf711db7647d6e290b457ddaf86f77110e80ebeb9be8

View File

@ -34,7 +34,10 @@ fi
# OpenJDK from Shenandoah project
export PROJECT_NAME="shenandoah"
export REPO_NAME="jdk11"
export VERSION="jdk-11+20"
# warning, clonning without shenadnaoh suffix, you will clone pure jdk - thus without shenandaoh GC
# export VERSION="shenandoah-jdk11+22"
# will arrive at wednesday
export VERSION="c435b8430811"
export COMPRESSION=xz
# unset tapsets overrides
export OPENJDK_URL=""
@ -52,6 +55,8 @@ else
echo ${FILENAME}
fi
set +e
major=`echo $REPO_NAME | sed 's/[a-zA-Z]*//g'`
build=`echo $VERSION | sed 's/.*+//g'`
name_helper=`echo $FILENAME | sed s/$major/'%{majorver}'/g `