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

8235767: Compilation failure caused by JDK-8212780: Packaging Tool Implementation

Browse Source 
Reviewed-by: rkennke, asemenyuk
This commit is contained in:
Alexander Matveev 2019-12-11 13:47:44 -05:00
parent bca86d6492
commit b29f62ce51
1 changed files with 26 additions and 6 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,7 +8,8 @@
# Fail fast # Fail fast
set -e; set -o pipefail; 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 workdir=/tmp/jpackage_jtreg_testing
jtreg_jar=$workdir/jtreg/lib/jtreg.jar jtreg_jar=$workdir/jtreg/lib/jtreg.jar
jpackage_test_selector=test/jdk/tools/jpackage jpackage_test_selector=test/jdk/tools/jpackage
@ -180,6 +181,12 @@ if [ ! -e "$JAVA_HOME/bin/java" ]; then
fatal JAVA_HOME variable is set to [$JAVA_HOME] value, but $JAVA_HOME/bin/java not found. fatal JAVA_HOME variable is set to [$JAVA_HOME] value, but $JAVA_HOME/bin/java not found.
fi 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 [ -n "$runtime_dir" ]; then
if [ ! -d "$runtime_dir" ]; then if [ ! -d "$runtime_dir" ]; then
fatal 'Value of `-r` option is set to non-existing directory'. fatal 'Value of `-r` option is set to non-existing directory'.
@ -218,12 +225,25 @@ fi
installJtreg () installJtreg ()
{ {
# Install jtreg if missing # Install jtreg if missing
if [ ! -f "$jtreg_jar" ]; then if [ -z "$JTREG_HOME" ]; then
exec_command mkdir -p "$workdir" if [ ! -f "$jtreg_jar" ]; then
# TODO - restore code to download or copy jtreg.jar exec_command mkdir -p "$workdir"
# to $workdir/jtreg/lib/jtreg.jar if [[ ${jtreg_bundle: -7} == ".tar.gz" ]]; then
fatal "ERROR: All Tests Disabled until locating jtreg.jar implemented." 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
fi fi
echo 'jtreg jar file: '$jtreg_jar
} }