changeset 2898:5c3bad1d7f8a

6982840: sun/security/tools/jarsigner/emptymanifest.sh fails Reviewed-by: dholmes
author weijun
date Tue, 14 Sep 2010 10:18:16 +0800
parents be1ca1f90114
children a248eb631aa2
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	Mon Sep 13 09:55:03 2010 +0100
+++ b/test/sun/security/tools/jarsigner/emptymanifest.sh	Tue Sep 14 10:18:16 2010 +0800
@@ -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 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