test/sun/security/tools/jarsigner/warnings.sh

*** 1,7 ****
  #
! # Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.
--- 1,7 ----
  #
! # Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.
*** 21,31 ****
  # questions.
  #
  
  # @test
  # @bug 8024302
! # @bug 8026037
  # @summary Clarify jar verifications
  #
  
  if [ "${TESTJAVA}" = "" ] ; then
    JAVAC_CMD=`which javac`
--- 21,31 ----
  # questions.
  #
  
  # @test
  # @bug 8024302
! # @bug 8026037 8134124
  # @summary Clarify jar verifications
  #
  
  if [ "${TESTJAVA}" = "" ] ; then
    JAVAC_CMD=`which javac`
*** 41,57 ****
    * )
      FS="/"
      ;;
  esac
  
  KS=warnings.jks
  JFILE=warnings.jar
  
  KT="$TESTJAVA${FS}bin${FS}keytool -storepass changeit -keypass changeit \
          -keystore $KS"
  JAR=$TESTJAVA${FS}bin${FS}jar
! JARSIGNER="$TESTJAVA${FS}bin${FS}jarsigner -keystore $KS -storepass changeit"
  
  rm $KS 2> /dev/null
  
  LANG=C
  export LANG
--- 41,60 ----
    * )
      FS="/"
      ;;
  esac
  
+ # make the test locale independent
+ TESTTOOLVMOPTS="$TESTTOOLVMOPTS -J-Duser.language=en -J-Duser.country=US"
+ 
  KS=warnings.jks
  JFILE=warnings.jar
  
  KT="$TESTJAVA${FS}bin${FS}keytool -storepass changeit -keypass changeit \
          -keystore $KS"
  JAR=$TESTJAVA${FS}bin${FS}jar
! JARSIGNER="$TESTJAVA${FS}bin${FS}jarsigner ${TESTTOOLVMOPTS} -keystore $KS -storepass changeit"
  
  rm $KS 2> /dev/null
  
  LANG=C
  export LANG