stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8235788: Changeset for JDK-8235252 pushed with wrong bug ID

Browse Source 
Reviewed-by: prr
This commit is contained in:
Andy Herrick 2019-12-11 15:01:11 -05:00
parent 69c1729e26
commit 8b99e85fbc
1 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
test/jdk/tools/jpackage/run_tests.sh
View File

@ -8,8 +8,7 @@
# Fail fast
set -e; set -o pipefail;
# $JTREG_BUNDLE_URL (Link can be obtained from https://openjdk.java.net/jtreg/ page)
jtreg_bundle=$JTREG_BUNDLE_URL
workdir=/tmp/jpackage_jtreg_testing
jtreg_jar=$workdir/jtreg/lib/jtreg.jar
jpackage_test_selector=test/jdk/tools/jpackage
@ -181,12 +180,6 @@ if [ ! -e "$JAVA_HOME/bin/java" ]; then
fatal JAVA_HOME variable is set to [$JAVA_HOME] value, but $JAVA_HOME/bin/java not found.
fi
if [ -z "$JTREG_HOME" ]; then
if [ -z "$JTREG_BUNDLE_URL" ]; then
fatal 'JTREG_HOME or JTREG_BUNDLE_URL environment variable is not set. Link to JTREG bundle can be found at https://openjdk.java.net/jtreg/'.
fi
fi
if [ -n "$runtime_dir" ]; then
if [ ! -d "$runtime_dir" ]; then
fatal 'Value of `-r` option is set to non-existing directory'.
@ -225,25 +218,12 @@ fi
installJtreg ()
{
# Install jtreg if missing
if [ -z "$JTREG_HOME" ]; then
if [ ! -f "$jtreg_jar" ]; then
exec_command mkdir -p "$workdir"
if [[ ${jtreg_bundle: -7} == ".tar.gz" ]]; then
exec_command "(" cd "$workdir" "&&" wget "$jtreg_bundle" "&&" tar -xzf "$(basename $jtreg_bundle)" ";" rm -f "$(basename $jtreg_bundle)" ")"
else
if [[ ${jtreg_bundle: -4} == ".zip" ]]; then
exec_command "(" cd "$workdir" "&&" wget "$jtreg_bundle" "&&" unzip "$(basename $jtreg_bundle)" ";" rm -f "$(basename $jtreg_bundle)" ")"
else
fatal 'Unsupported extension of JREG bundle ['$JTREG_BUNDLE_URL']. Only *.zip or *.tar.gz is supported.'
fi
fi
fi
else
# use jtreg provided via JTREG_HOME
jtreg_jar=$JTREG_HOME/lib/jtreg.jar
if [ ! -f "$jtreg_jar" ]; then
exec_command mkdir -p "$workdir"
# TODO - restore code to download or copy jtreg.jar
# to $workdir/jtreg/lib/jtreg.jar
fatal "ERROR: All Tests Disabled until locating jtreg.jar implemented."
fi
echo 'jtreg jar file: '$jtreg_jar
}