test/jdk/tools/jpackage/test_jpackage.sh

*** 27,43 ****
--- 27,50 ----
  {
    args=()
    local arg_is_output_dir=
    local arg_is_mode=
    local output_dir_set=
+   local with_append_actions=yes
    for arg in "$@"; do
      if [ "$arg" == "-o" ]; then
        arg_is_output_dir=yes
        output_dir_set=yes
      elif [ "$arg" == "-m" ]; then
        arg_is_mode=yes
        continue
+     elif [ "$arg" == '--' ]; then
+       append_actions
+       with_append_actions=
+       continue
+     elif ! case "$arg" in -Djpackage.test.action=*) false;; esac; then
+       continue
      elif [ -n "$arg_is_output_dir" ]; then
        arg_is_output_dir=
        output_dir="$arg"
      elif [ -n "$arg_is_mode" ]; then
        arg_is_mode=
*** 45,54 ****
--- 52,68 ----
      fi
  
      args+=( "$arg" )
    done
    [ -n "$output_dir_set" ] || args=( -o "$output_dir" "${args[@]}" )
+   [ -z "$with_append_actions" ] || append_actions
+ }
+ 
+ 
+ append_actions ()
+ {
+   args+=( '--' '-Djpackage.test.action=create,install,verify-install,uninstall,verify-uninstall' )
  }
  
  
  exec_command ()
  {
*** 60,68 ****
  }
  
  set_args "$@"
  basedir="$(dirname $0)"
  exec_command "$basedir/run_tests.sh" -m create "${args[@]}"
- exec_command "$basedir/manage_packages.sh" -d "$output_dir"
- exec_command "$basedir/run_tests.sh" -m verify-install "${args[@]}"
- exec_command "$basedir/manage_packages.sh" -d "$output_dir" -u
- exec_command "$basedir/run_tests.sh" -m verify-uninstall "${args[@]}"
--- 74,78 ----