Skip to content

Now running with custom jtregs, whch supports properly logged sh output #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 6, 2024
Merged

Now running with custom jtregs, whch supports properly logged sh output #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da90c2b
Now running with custom jtregs, whch supports properly logged sh output
judovana Mar 6, 2024
ebc9d90
Moved to jtrfix versions only
judovana Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,6 @@ else
fi
fi

if [ ! -e "$JTREG_HOME" ] ; then
ball=jtreg5.1-b01.tar.gz
wget https://ci.adoptopenjdk.net/view/Dependencies/job/dependency_pipeline/lastSuccessfulBuild/artifact/jtreg/$ball
tar -xf $ball
fi

if [ "x$JDK_MAJOR" == "x" ] ; then
JDK_MAJOR=8
if [[ -e "$JAVA/bin/jshell" || -e "$JAVA/bin/jshell.exe" ]] ; then
Expand All @@ -73,6 +67,18 @@ if [ "x$JDK_MAJOR" == "x" ] ; then
fi
echo "treating jdk as: $JDK_MAJOR"

if [ ! -e "$JTREG_HOME" ] ; then
if [ "0$JDK_MAJOR" -le "8" ] ; then
ball=jtreg-6+1.tar.gz
wget "https://github.com/andrlos/jtreg/releases/download/6.1-jtrfix-V01.0/$ball"
else
ball=jtreg-7.3+1.tar.gz
wget "https://ci.adoptopenjdk.net/view/Dependencies/job/dependency_pipeline/lastSuccessfulBuild/artifact/jtreg/$ball"
fi
tar -xf $ball
fi


JAVA_OPTS="";
if [ "0$JDK_MAJOR" -gt 11 ] ; then
JAVA_OPTS="-javaoption:-Djava.security.manager=allow"
Expand Down