equal
deleted
inserted
replaced
107 CheckFiles BadZip/Lib.zip BadJar/Lib.jar BadSrc/Lib.java |
107 CheckFiles BadZip/Lib.zip BadJar/Lib.jar BadSrc/Lib.java |
108 |
108 |
109 echo 'public class Main {public static void main(String[] a) {Lib.f();}}' > Main.java |
109 echo 'public class Main {public static void main(String[] a) {Lib.f();}}' > Main.java |
110 |
110 |
111 # Create a jar file that is good enough to put on the javac boot class path (i.e. contains java.lang.**) |
111 # Create a jar file that is good enough to put on the javac boot class path (i.e. contains java.lang.**) |
112 Sys "$jimage" extract --dir modules ${TESTJAVA}/lib/modules |
112 if [ -r ${TESTJAVA}/lib/modules ]; then |
113 Sys "$jar" cf java-lang.jar -C modules/java.base java/lang |
113 Sys "$jimage" extract --dir modules ${TESTJAVA}/lib/modules |
114 Sys rm -rf modules |
114 Sys "$jar" cf java-lang.jar -C modules/java.base java/lang |
|
115 Sys rm -rf modules |
|
116 elif [ -d ${TESTJAVA}/modules ]; then |
|
117 Sys "$jar" cf java-lang.jar -C ${TESTJAVA}/modules/java.base java/lang |
|
118 else |
|
119 echo 'cannot create java-lang.jar' ; exit 1 |
|
120 fi |
115 |
121 |
116 #---------------------------------------------------------------- |
122 #---------------------------------------------------------------- |
117 # Verify that javac class search order is the same as java's |
123 # Verify that javac class search order is the same as java's |
118 #---------------------------------------------------------------- |
124 #---------------------------------------------------------------- |
119 Failure "$javac" -source 8 -target 8 ${TESTTOOLVMOPTS} \ |
125 Failure "$javac" -source 8 -target 8 ${TESTTOOLVMOPTS} \ |