Mercurial > hg > openjdk > jdk6 > jdk
changeset 1543:c4d485564741
6982840: sun/security/tools/jarsigner/emptymanifest.sh fails
Reviewed-by: dholmes
author | weijun |
---|---|
date | Tue, 20 Dec 2016 04:04:55 +0000 |
parents | 4fd0d817f510 |
children | bc2b5715ea8e |
files | test/sun/security/tools/jarsigner/emptymanifest.sh |
diffstat | 1 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/test/sun/security/tools/jarsigner/emptymanifest.sh Tue Dec 20 04:03:45 2016 +0000 +++ b/test/sun/security/tools/jarsigner/emptymanifest.sh Tue Dec 20 04:04:55 2016 +0000 @@ -1,5 +1,5 @@ # -# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 2010, 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 @@ -49,13 +49,23 @@ KT="$TESTJAVA${FS}bin${FS}keytool -storepass changeit -keypass changeit -keystore $KS" JAR=$TESTJAVA${FS}bin${FS}jar +JAVA=$TESTJAVA${FS}bin${FS}java +JAVAC=$TESTJAVA${FS}bin${FS}javac JARSIGNER=$TESTJAVA${FS}bin${FS}jarsigner rm $KS $JFILE echo A > A echo B > B mkdir META-INF -printf "\r\n" > META-INF${FS}MANIFEST.MF +cat <<EOF > CrLf.java +class CrLf { + public static void main(String[] args) throws Exception { + System.out.write(new byte[] {'\r', '\n'}); + } +} +EOF +$JAVAC CrLf.java +$JAVA ${TESTVMOPTS} CrLf > META-INF${FS}MANIFEST.MF zip $JFILE META-INF${FS}MANIFEST.MF A B $KT -alias a -dname CN=a -keyalg rsa -genkey -validity 300