changeset 57418:d188996ea355

8235767: Compilation failure caused by JDK-8212780: Packaging Tool Implementation Reviewed-by: rkennke, asemenyuk
author almatvee
date Wed, 11 Dec 2019 13:47:44 -0500
parents 3ccdeba59e25
children 28e6387d4a70
files test/jdk/tools/jpackage/run_tests.sh
diffstat 1 files changed, 26 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/test/jdk/tools/jpackage/run_tests.sh	Wed Dec 11 09:47:41 2019 -0800
+++ b/test/jdk/tools/jpackage/run_tests.sh	Wed Dec 11 13:47:44 2019 -0500
@@ -8,7 +8,8 @@
 # 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
@@ -180,6 +181,12 @@
   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'.
@@ -218,12 +225,25 @@
 installJtreg ()
 {
   # Install jtreg if missing
-  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."
+  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
   fi
+
+  echo 'jtreg jar file: '$jtreg_jar
 }