# HG changeset patch
# User mullan
# Date 1387892541 18000
# Node ID 658d6e464dd5f50e3b71990201c2ce66064be260
# Parent ba496138fa35e8e397d49540bc7122b330770a2d# Parent ea618fb75ffa0b7e0f0145acf41c3a608dc36c8e
Merge
diff -r ba496138fa35 -r 658d6e464dd5 jdk/make/Images.gmk
--- a/jdk/make/Images.gmk Tue Dec 24 08:40:40 2013 -0500
+++ b/jdk/make/Images.gmk Tue Dec 24 08:42:21 2013 -0500
@@ -190,26 +190,6 @@
$(foreach f,$(filter $(OVERLAY_FILTER),$(JDKJRE_BIN_LIST)), \
$(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR)/jre,$f,JDKJRE_BIN_TARGETS)))
-ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64)
- define AddIsadirLink
- # Param 1 - src file
- # Param 2 - variable to add targets to
-
- $1_LINK := $$(dir $1)$(OPENJDK_TARGET_CPU_ISADIR)/$$(notdir $1)
-
- $$($1_LINK):
- $(ECHO) $(LOG_INFO) Creating link $$(patsubst $(OUTPUT_ROOT)/%,%,$$@)
- $(MKDIR) -p $$(@D)
- $(LN) -s ../$$(@F) $$@
-
- $2 += $$($1_LINK)
- endef
-
- $(foreach f,$(JRE_BIN_TARGETS),$(eval $(call AddIsadirLink,$f,JRE_BIN_ISADIR_LINK_TARGETS)))
- $(foreach f,$(JDK_BIN_TARGETS),$(eval $(call AddIsadirLink,$f,JDK_BIN_ISADIR_LINK_TARGETS)))
- $(foreach f,$(JDKJRE_BIN_TARGETS),$(eval $(call AddIsadirLink,$f,JDKJRE_BIN_ISADIR_LINK_TARGETS)))
-endif
-
################################################################################
# /lib dir
ifneq ($(OPENJDK_TARGET_OS), macosx)
diff -r ba496138fa35 -r 658d6e464dd5 jdk/test/javax/xml/jaxp/parsers/8029955/EntityScannerTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/xml/jaxp/parsers/8029955/EntityScannerTest.java Tue Dec 24 08:42:21 2013 -0500
@@ -0,0 +1,67 @@
+/*
+ * 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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8029955
+ * @summary test that the size of whitespace lookup buffer is adjusted as needed
+ * @run main EntityScannerTest
+ */
+
+import java.io.*;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLReaderFactory;
+
+
+/**
+ *
+ * @author Joe Wang huizhe.wang@oracle.com
+ */
+public class EntityScannerTest {
+
+ /**
+ * main method.
+ *
+ * @param args Standard args.
+ */
+ public static void main(String[] args) {
+ try {
+ StringBuilder builder = new StringBuilder();
+ builder.append("");
+ final XMLReader reader = XMLReaderFactory.createXMLReader();
+ System.out.println(reader.getClass().getName());
+ reader.parse(new InputSource(new StringReader(builder.toString())));
+ } catch (ArrayIndexOutOfBoundsException e) {
+ throw new RuntimeException("Test failed: ArrayIndexOutOfBoundsException " + e.getMessage());
+ } catch (Exception e) {
+ throw new RuntimeException(e.getMessage());
+ }
+ }
+
+}
diff -r ba496138fa35 -r 658d6e464dd5 jdk/test/tools/launcher/ExecutionEnvironment.java
--- a/jdk/test/tools/launcher/ExecutionEnvironment.java Tue Dec 24 08:40:40 2013 -0500
+++ b/jdk/test/tools/launcher/ExecutionEnvironment.java Tue Dec 24 08:42:21 2013 -0500
@@ -46,9 +46,6 @@
* b. LD_LIBRARY_PATH32 is ignored if set
* 5. no extra symlink exists on Solaris ie.
* jre/lib/$arch/libjvm.so -> client/libjvm.so
- * 6. Since 32-bit Solaris is no longer supported we continue to ensure that
- * the appropriate paths are ignored or used, additionally we also test to
- * ensure the 64-bit isadir exists and contains appropriate links.
* TODO:
* a. perhaps we need to add a test to audit all environment variables are
* in pristine condition after the launch, there may be a few that the
@@ -57,17 +54,10 @@
*/
import java.io.File;
import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.nio.file.DirectoryStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static java.nio.file.LinkOption.*;
-import java.util.regex.Pattern;
-
public class ExecutionEnvironment extends TestHelper {
static final String LD_LIBRARY_PATH = TestHelper.isMacOSX
@@ -270,56 +260,6 @@
throw new RuntimeException("symlink exists " + symLink.getAbsolutePath());
}
}
-
- /*
- * verify if all the symlinks in the images are created correctly,
- * only on solaris, this test works only on images.
- */
- @Test
- void testSymLinks() throws Exception {
- if (!isSolaris)
- return;
- verifySymLinks(JAVA_BIN);
- verifySymLinks(JAVA_JRE_BIN);
- }
- // exclude non-consequential binaries or scripts co-packaged in other
- // build phases
- private final String excludeRE =
- ".*jvisualvm.*" +
- "|.*javaws.*" +
- "|.*ControlPanel.*" +
- "|.*java-rmi.cgi" +
- "|.*jcontrol.*";
- private final Pattern symlinkExcludes = Pattern.compile(excludeRE);
-
- private void verifySymLinks(String bindir) throws IOException {
- File binDir = new File(bindir);
- System.err.println("verifying links in: " + bindir);
- File isaDir = new File(binDir, getArch()).getAbsoluteFile();
- if (!isaDir.exists()) {
- throw new RuntimeException("dir: " + isaDir + " does not exist");
- }
- try (DirectoryStream ds = Files.newDirectoryStream(binDir.toPath())) {
- for (Path p : ds) {
- if (symlinkExcludes.matcher(p.toString()).matches() ||
- Files.isDirectory(p, NOFOLLOW_LINKS)) {
- continue;
- }
- Path link = new File(isaDir, p.getFileName().toString()).toPath();
- if (Files.isSymbolicLink(link)) {
- Path target = Files.readSymbolicLink(link);
- if (target.startsWith("..") && p.endsWith(target.getFileName())) {
- // System.out.println(target + " OK");
- continue;
- }
- System.err.println("target:" + target);
- System.err.println("file:" + p);
- }
- throw new RuntimeException("could not find link to " + p);
- }
- }
-
- }
public static void main(String... args) throws Exception {
if (isWindows) {
System.err.println("Warning: test not applicable to windows");