diff --git a/googletest-release-1.8.1.tar.gz b/googletest-release-1.8.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..872ca25d8a02a6fb4d352b7509dd92d902812ca7 Binary files /dev/null and b/googletest-release-1.8.1.tar.gz differ diff --git a/java-17-alibaba-dragonwell.spec b/java-17-alibaba-dragonwell.spec index 7f79a73735af9cdbe36b242732de211371a06434..fa8d70809fa027386d5f3f9ca81652d427a8cd01 100644 --- a/java-17-alibaba-dragonwell.spec +++ b/java-17-alibaba-dragonwell.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %bcond_without fastdebug %bcond_without slowdebug @@ -19,6 +19,7 @@ %global enable_hsdis 0 %global is_system_jdk 0 +%global anolis 0 %global major_ver 17 %global inter_ver 0 @@ -182,6 +183,8 @@ Source7: TestECDSA.java Source8: TestSecurityProperties.java Source11: tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz +Source12: jtreg-7.1.1.1.zip +Source13: googletest-release-1.8.1.tar.gz BuildArch: x86_64 aarch64 @@ -242,26 +245,26 @@ Requires: gtk-update-icon-cache Recommends: gtk3 %if %is_system_jdk -%if 0%{anolis} +%if %anolis Provides: java = %{epoch}:%{version}-%{release} Provides: java-%{origin} = %{epoch}:%{version}-%{release} %endif Provides: java-%{drag_origin} = %{epoch}:%{version}-%{release} -%if 0%{anolis} +%if %anolis Provides: jre = %{epoch}:%{version}-%{release} Provides: jre-%{origin} = %{epoch}:%{version}-%{release} %endif Provides: jre-%{drag_origin} = %{epoch}:%{version}-%{release} %endif -%if 0%{anolis} +%if %anolis Provides: java-%{major_ver} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}%{?_isa} = %{epoch}:%{version}-%{release} %endif Provides: java-%{major_ver}-%{drag_origin} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_origin}%{?_isa} = %{epoch}:%{version}-%{release} -%if 0%{anolis} +%if %anolis Provides: jre-%{major_ver} = %{epoch}:%{version}-%{release} Provides: jre-%{major_ver}-%{origin} = %{epoch}:%{version}-%{release} %endif @@ -274,14 +277,14 @@ Alibaba Dragonwell17 JDK Summary: Alibaba Dragonwell17 demo Requires: %{name} = %{epoch}:%{version}-%{release} %if %is_system_jdk -%if 0%{anolis} +%if %anolis Provides: java-demo = %{epoch}:%{version}-%{release} Provides: java-%{origin}-demo = %{epoch}:%{version}-%{release} %endif Provides: java-%{drag_origin}-demo = %{epoch}:%{version}-%{release} %endif -%if 0%{anolis} +%if %anolis Provides: java-%{major_ver}-demo = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-demo = %{epoch}:%{version}-%{release} %endif @@ -301,19 +304,19 @@ Requires: javapackages-filesystem Requires(post): %{alternatives_requires} Requires(postun): %{alternatives_requires} %if %is_system_jdk -%if 0%{anolis} +%if %anolis Provides: java-headless = %{epoch}:%{version}-%{release} Provides: java-%{origin}-headless = %{epoch}:%{version}-%{release} %endif Provides: java-%{major_ver}-%{drag_origin}-headless = %{epoch}:%{version}-%{release} -%if 0%{anolis} +%if %anolis Provides: jre-headless = %{epoch}:%{version}-%{release} Provides: jre-%{origin}-headless = %{epoch}:%{version}-%{release} %endif Provides: java-%{drag_origin}-headless = %{epoch}:%{version}-%{release} Provides: jre-%{drag_origin}-headless = %{epoch}:%{version}-%{release} %endif -%if 0%{anolis} +%if %anolis Provides: java-%{major_ver}-headless = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-headless%{?_isa} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-headless = %{epoch}:%{version}-%{release} @@ -332,25 +335,25 @@ Requires(post): %{alternatives_requires} Requires(postun): %{alternatives_requires} %if %is_system_jdk -%if 0%{anolis} +%if %anolis Provides: java-devel = %{epoch}:%{version}-%{release} Provides: java-devel-%{origin} = %{epoch}:%{version}-%{release} %endif Provides: java-devel-%{drag_origin} = %{epoch}:%{version}-%{release} -%if 0%{anolis} +%if %anolis Provides: java-sdk = %{epoch}:%{version}-%{release} Provides: java-sdk-%{origin} = %{epoch}:%{version}-%{release} %endif Provides: java-sdk-%{drag_origin} = %{epoch}:%{version}-%{release} %endif -%if 0%{anolis} +%if %anolis Provides: java-%{major_ver}-devel = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-devel%{?_isa} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-devel = %{epoch}:%{version}-%{release} %endif Provides: java-%{major_ver}-%{drag_origin}-devel = %{epoch}:%{version}-%{release} -%if 0%{anolis} +%if %anolis Provides: java-sdk-%{major_ver} = %{epoch}:%{version}-%{release} Provides: java-sdk-%{major_ver}-%{origin} = %{epoch}:%{version}-%{release} %endif @@ -362,13 +365,13 @@ Alibaba Dragonwell17 devel %package src Summary: Alibaba Dragonwell17 src Requires: %{name}-headless = %{epoch}:%{version}-%{release} -%if 0%{anolis} +%if %anolis Provides: java-%{major_ver}-src = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-src = %{epoch}:%{version}-%{release} %endif Provides: java-%{major_ver}-%{drag_origin}-src = %{epoch}:%{version}-%{release} %if %is_system_jdk -%if 0%{anolis} +%if %anolis Provides: java-src = %{epoch}:%{version}-%{release} Provides: java-%{origin}-src = %{epoch}:%{version}-%{release} %endif @@ -381,7 +384,7 @@ Alibaba Dragonwell17 src %package static-libs Summary: Alibaba Dragonwell17 static libs Requires: %{name}-devel = %{epoch}:%{version}-%{release} -%if 0%{anolis} +%if %anolis Provides: java-%{major_ver}-static-libs = %{epoch}:%{version}-%{release} %endif @@ -395,11 +398,11 @@ Requires(postun): %{alternatives_requires} # Require javapackages-filesystem for ownership of /usr/lib/jvm/ and macros Requires: javapackages-filesystem %if %is_system_jdk -%if 0%{anolis} +%if %anolis Provides: java-javadoc = %{epoch}:%{version}-%{release} %endif %endif -%if 0%{anolis} +%if %anolis Provides: java-%{major_ver}-javadoc = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-javadoc = %{epoch}:%{version}-%{release} %endif @@ -415,11 +418,11 @@ Requires(postun): %{alternatives_requires} # Require javapackages-filesystem for ownership of /usr/lib/jvm/ and macros Requires: javapackages-filesystem %if %is_system_jdk -%if 0%{anolis} +%if %anolis Provides: java-javadoc-zip = %{epoch}:%{version}-%{release} %endif %endif -%if 0%{anolis} +%if %anolis Provides: java-%{major_ver}-javadoc-zip = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-javadoc-zip = %{epoch}:%{version}-%{release} %endif @@ -432,11 +435,11 @@ Alibaba Dragonwell17 javadoc zip Summary: Alibaba Dragonwell17 jmods Requires: %{name}-devel = %{epoch}:%{version}-%{release} %if %is_system_jdk -%if 0%{anolis} +%if %anolis Provides: java-jmods = %{epoch}:%{version}-%{release} %endif %endif -%if 0%{anolis} +%if %anolis Provides: java-%{major_ver}-jmods = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-jmods = %{epoch}:%{version}-%{release} %endif @@ -453,26 +456,26 @@ Requires: xorg-x11-fonts-Type1 Requires: libXcomposite Requires: %{name}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} %if %is_system_jdk -%if 0%{anolis} +%if %anolis Provides: java%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} %endif Provides: java-%{drag_origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} -%if 0%{anolis} +%if %anolis Provides: jre%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} %endif Provides: jre-%{drag_origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} %endif -%if 0%{anolis} +%if %anolis Provides: java-%{major_ver}%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}%{slowdebug_build}%{?_isa} = %{epoch}:%{version}-%{release} %endif Provides: java-%{major_ver}-%{drag_origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_origin}%{slowdebug_build}%{?_isa} = %{epoch}:%{version}-%{release} -%if 0%{anolis} +%if %anolis Provides: jre-%{major_ver}%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{major_ver}-%{origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} %endif @@ -492,24 +495,24 @@ Requires: javapackages-filesystem Requires(post): %{alternatives_requires} Requires(postun): %{alternatives_requires} %if %is_system_jdk -%if 0%{anolis} +%if %anolis Provides: java-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{origin}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} %endif Provides: java-%{drag_origin}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} -%if 0%{anolis} +%if %anolis Provides: jre-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{origin}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} %endif Provides: jre-%{drag_origin}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} %endif -%if 0%{anolis} +%if %anolis Provides: java-%{major_ver}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-headless%{slowdebug_build}%{?_isa} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} %endif Provides: java-%{major_ver}-%{drag_origin}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} -%if 0%{anolis} +%if %anolis Provides: jre-%{major_ver}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{major_ver}-%{origin}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} %endif @@ -524,24 +527,24 @@ Requires: %{name}%{slowdebug_build} = %{epoch}:%{version}-%{release} Requires(post): %{alternatives_requires} Requires(postun): %{alternatives_requires} %if %is_system_jdk -%if 0%{anolis} +%if %anolis Provides: java-devel%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-devel-%{origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} %endif Provides: java-devel-%{drag_origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} -%if 0%{anolis} +%if %anolis Provides: java-sdk%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-sdk-%{origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} %endif Provides: java-sdk-%{drag_origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} %endif -%if 0%{anolis} +%if %anolis Provides: java-%{major_ver}-devel%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-devel%{slowdebug_build}%{?_isa} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-devel%{slowdebug_build} = %{epoch}:%{version}-%{release} %endif Provides: java-%{major_ver}-%{drag_origin}-devel%{slowdebug_build} = %{epoch}:%{version}-%{release} -%if 0%{anolis} +%if %anolis Provides: java-sdk-%{major_ver}%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-sdk-%{major_ver}-%{origin}%{slowdebug_build} = %{epoch}:%{version}-%{release} %endif @@ -562,11 +565,11 @@ Alibaba Dragonwell17 Runtime Environment static libs slowdebug Summary: Alibaba Dragonwell17 Runtime Environment jmods slowdebug Requires: %{name}-devel%{slowdebug_build} = %{epoch}:%{version}-%{release} %if %is_system_jdk -%if 0%{anolis} +%if %anolis Provides: java-jmods%{slowdebug_build} = %{epoch}:%{version}-%{release} %endif %endif -%if 0%{anolis} +%if %anolis Provides: java-%{major_ver}-jmods%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-jmods%{slowdebug_build} = %{epoch}:%{version}-%{release} %endif @@ -579,13 +582,13 @@ Alibaba Dragonwell17 Runtime Environment jmods slowdebug Summary: Alibaba Dragonwell17 Runtime Environment demoslowdebug Requires: %{name}%{slowdebug_build} = %{epoch}:%{version}-%{release} %if %is_system_jdk -%if 0%{anolis} +%if %anolis Provides: java-demo%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{origin}-demo%{slowdebug_build} = %{epoch}:%{version}-%{release} %endif Provides: java-%{drag_origin}-demo%{slowdebug_build} = %{epoch}:%{version}-%{release} %endif -%if 0%{anolis} +%if %anolis Provides: java-%{major_ver}-demo%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-demo%{slowdebug_build} = %{epoch}:%{version}-%{release} %endif @@ -597,13 +600,13 @@ Alibaba Dragonwell17 Runtime Environment demo slowdebug %package src-slowdebug Summary: Alibaba Dragonwell17 Runtime Environment src slowdebug Requires: %{name}-headless%{slowdebug_build} = %{epoch}:%{version}-%{release} -%if 0%{anolis} +%if %anolis Provides: java-%{major_ver}-src%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-src%{slowdebug_build} = %{epoch}:%{version}-%{release} %endif Provides: java-%{major_ver}-%{drag_origin}-src%{slowdebug_build} = %{epoch}:%{version}-%{release} %if %is_system_jdk -%if 0%{anolis} +%if %anolis Provides: java-src%{slowdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{origin}-src%{slowdebug_build} = %{epoch}:%{version}-%{release} %endif @@ -622,25 +625,25 @@ Requires: xorg-x11-fonts-Type1 Requires: libXcomposite Requires: %{name}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} %if %is_system_jdk -%if 0%{anolis} +%if %anolis Provides: java%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} %endif Provides: java-%{drag_origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} -%if 0%{anolis} +%if %anolis Provides: jre%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} %endif Provides: jre-%{drag_origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} %endif -%if 0%{anolis} +%if %anolis Provides: java-%{major_ver}%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}%{fastdebug_build}%{?_isa} = %{epoch}:%{version}-%{release} %endif Provides: java-%{major_ver}-%{drag_origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{drag_origin}%{fastdebug_build}%{?_isa} = %{epoch}:%{version}-%{release} -%if 0%{anolis} +%if %anolis Provides: jre-%{major_ver}%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{major_ver}-%{origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} %endif @@ -660,24 +663,24 @@ Requires: javapackages-filesystem Requires(post): %{alternatives_requires} Requires(postun): %{alternatives_requires} %if %is_system_jdk -%if 0%{anolis} +%if %anolis Provides: java-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{origin}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} %endif Provides: java-%{drag_origin}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} -%if 0%{anolis} +%if %anolis Provides: jre-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{origin}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} %endif Provides: jre-%{drag_origin}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} %endif -%if 0%{anolis} +%if %anolis Provides: java-%{major_ver}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-headless%{fastdebug_build}%{?_isa} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} %endif Provides: java-%{major_ver}-%{drag_origin}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} -%if 0%{anolis} +%if %anolis Provides: jre-%{major_ver}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: jre-%{major_ver}-%{origin}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} %endif @@ -691,25 +694,25 @@ Summary: Alibaba Dragonwell17 Runtime Environment devel fastdebug Requires: %{name}%{fastdebug_build} = %{epoch}:%{version}-%{release} Requires(post): %{alternatives_requires} Requires(postun): %{alternatives_requires} -%if 0%{anolis} +%if %anolis Provides: java-%{major_ver}-devel%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-devel%{fastdebug_build}%{?_isa} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-devel%{fastdebug_build} = %{epoch}:%{version}-%{release} %endif Provides: java-%{major_ver}-%{drag_origin}-devel%{fastdebug_build} = %{epoch}:%{version}-%{release} %if %is_system_jdk -%if 0%{anolis} +%if %anolis Provides: java-devel%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-devel-%{origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} %endif Provides: java-devel-%{drag_origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} -%if 0%{anolis} +%if %anolis Provides: java-sdk%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-sdk-%{origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} %endif Provides: java-sdk-%{drag_origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} %endif -%if 0%{anolis} +%if %anolis Provides: java-sdk-%{major_ver}%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-sdk-%{major_ver}-%{origin}%{fastdebug_build} = %{epoch}:%{version}-%{release} %endif @@ -730,11 +733,11 @@ Alibaba Dragonwell17 Runtime Environment static libs fastdebug Summary: Alibaba Dragonwell17 Runtime Environment jmods fastdebug Requires: %{name}-devel%{fastdebug_build} = %{epoch}:%{version}-%{release} %if %is_system_jdk -%if 0%{anolis} +%if %anolis Provides: java-jmods%{fastdebug_build} = %{epoch}:%{version}-%{release} %endif %endif -%if 0%{anolis} +%if %anolis Provides: java-%{major_ver}-jmods%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-jmods%{fastdebug_build} = %{epoch}:%{version}-%{release} %endif @@ -746,13 +749,13 @@ Alibaba Dragonwell17 Runtime Environment jmods fastdebug %package demo-fastdebug Summary: Alibaba Dragonwell17 Runtime Environment demofastdebug Requires: %{name}%{fastdebug_build} = %{epoch}:%{version}-%{release} -%if 0%{anolis} +%if %anolis Provides: java-%{major_ver}-demo%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-demo%{fastdebug_build} = %{epoch}:%{version}-%{release} %endif Provides: java-%{major_ver}-%{drag_origin}-demo%{fastdebug_build} = %{epoch}:%{version}-%{release} %if %is_system_jdk -%if 0%{anolis} +%if %anolis Provides: java-demo%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{origin}-demo%{fastdebug_build} = %{epoch}:%{version}-%{release} %endif @@ -765,13 +768,13 @@ Alibaba Dragonwell17 Runtime Environment demo fastdebug %package src-fastdebug Summary: Alibaba Dragonwell17 Runtime Environment src fastdebug Requires: %{name}-headless%{fastdebug_build} = %{epoch}:%{version}-%{release} -%if 0%{anolis} +%if %anolis Provides: java-%{major_ver}-src%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{major_ver}-%{origin}-src%{fastdebug_build} = %{epoch}:%{version}-%{release} %endif Provides: java-%{major_ver}-%{drag_origin}-src%{fastdebug_build} = %{epoch}:%{version}-%{release} %if %is_system_jdk -%if 0%{anolis} +%if %anolis Provides: java-src%{fastdebug_build} = %{epoch}:%{version}-%{release} Provides: java-%{origin}-src%{fastdebug_build} = %{epoch}:%{version}-%{release} %endif @@ -795,6 +798,14 @@ sh %{SOURCE5} %{top_level_dir_name} # Extract systemtap tapsets tar --strip-components=1 -x -I xz -f %{SOURCE11} + +# Extrace jtreg zip file +rm -rf jtreg +unzip %{SOURCE12} + +# Extrace googletest tar file +rm -rf googletest-release-1.8.1 +tar xf %{SOURCE13} %if %{with slowdebug} cp -r tapset tapset-slowdebug @@ -834,12 +845,19 @@ done export NUM_PROC=%(/usr/bin/getconf _NPROCESSORS_ONLN 2> /dev/null || :) export NUM_PROC=${NUM_PROC:-1} +abort_build() { + echo "An error \"${1}\" occurred. Exiting build process." + echo exit 1 +} + function buildjdk() { local outputdir=${1} local buildjdk=${2} local maketargets="${3}" local debuglevel=${4} local link_opt=${5} + local jtreg_path=$(pwd)/jtreg + local gtest_path=$(pwd)/googletest-release-1.8.1 local top_dir_abs_src_path=$(pwd)/%{top_level_dir_name} local top_dir_abs_build_path=$(pwd)/${outputdir} @@ -879,7 +897,9 @@ function buildjdk() { --with-num-cores="$NUM_PROC" \ --disable-javac-server \ --with-jvm-features=zgc \ - --disable-warnings-as-errors + --disable-warnings-as-errors \ + --with-gtest=${gtest_path} \ + --with-jtreg=${jtreg_path} make \ LOG=trace \ @@ -887,6 +907,7 @@ function buildjdk() { CFLAGS_WARNINGS_ARE_ERRORS="-Wno-error" \ DISTRO_VERSION=%{distro_version} \ $maketargets || ( pwd; find ${top_dir_abs_src_path} ${top_dir_abs_build_path} -name "hs_err_pid*.log" | xargs cat && false ) + time make run-test-tier1 JTREG="JOBS=${NUM_PROC};TIMEOUT_FACTOR=4" || abort_build "make test fail" popd } @@ -2186,6 +2207,9 @@ alternatives --install %{_jvmdir}/java-%{major_ver}-%{origin} $key %{_jvmdir}/%{ %endif %changelog +* Thu Jun 13 2024 yansendao.ysd - 3:17.0.9.0.10.9-2 +- support make test during spec build + * Tue Nov 14 2023 lvfei.lv - 3:17.0.9.0.10.9-1 - update version to 17.0.9.0.10.9 diff --git a/jtreg-7.1.1.1.zip b/jtreg-7.1.1.1.zip new file mode 100644 index 0000000000000000000000000000000000000000..a2106b6079c71b715a1cf6dad4f7a6b29b5c0ba7 Binary files /dev/null and b/jtreg-7.1.1.1.zip differ