changeset 2713:1da725c7601e

Merge
author mchung
date Thu, 15 Sep 2016 13:14:36 -0700
parents 3ec350f5f32a 809f5c09b104
children 7b25afe560e2
files make/CompileJavaModules.gmk make/CreateJmods.gmk
diffstat 9 files changed, 80 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/.jcheck/conf	Mon Sep 12 09:38:26 2016 -0700
+++ b/.jcheck/conf	Thu Sep 15 13:14:36 2016 -0700
@@ -1,1 +1,4 @@
 project=jdk9
+comments=lax
+tags=lax
+bugids=dup
--- a/common/autoconf/generated-configure.sh	Mon Sep 12 09:38:26 2016 -0700
+++ b/common/autoconf/generated-configure.sh	Thu Sep 15 13:14:36 2016 -0700
@@ -5095,7 +5095,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1472718471
+DATE_WHEN_GENERATED=1473384351
 
 ###############################################################################
 #
--- a/common/conf/jib-profiles.js	Mon Sep 12 09:38:26 2016 -0700
+++ b/common/conf/jib-profiles.js	Thu Sep 15 13:14:36 2016 -0700
@@ -416,10 +416,8 @@
 
         jtreg: {
             server: "javare",
-            revision: "4.2",
-            build_number: "b03",
-            checksum_file: "MD5_VALUES",
-            file: "jtreg_bin-4.2.zip",
+            path: "java/re/jtreg/4.2/nightly/bundles/jtreg_bin-4.2.zip",
+            checksum_path: "java/re/jtreg/4.2/nightly/bundles/MD5_VALUES",
             environment_name: "JT_HOME"
         },
 
--- a/make/CreateJmods.gmk	Mon Sep 12 09:38:26 2016 -0700
+++ b/make/CreateJmods.gmk	Thu Sep 15 13:14:36 2016 -0700
@@ -44,6 +44,8 @@
 CONF_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \
     $(SUPPORT_OUTPUTDIR)/modules_conf $(IMPORT_MODULES_CONF))))
 CLASSES_DIR := $(wildcard $(JDK_OUTPUTDIR)/modules/$(MODULE))
+OTHER_FILES_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \
+    $(SUPPORT_OUTPUTDIR)/modules_other_files $(IMPORT_MODULES_OTHER_FILES))))
 
 $(eval $(call FillCacheFind, \
     $(LIBS_DIR) $(CMDS_DIR) $(CONF_DIR) $(CLASSES_DIR) \
@@ -78,7 +80,8 @@
     EXCLUDE_PATTERN := $(strip $(subst $(SPACE),|,$(strip $(ALL_UPGRADEABLE_MODULES))))
 
     JMOD_FLAGS += --module-path $(JMODS_DIR) \
-        --hash-modules '^(?!$(EXCLUDE_PATTERN))'
+        --hash-modules '^(?!$(EXCLUDE_PATTERN))' \
+        --other-files $(OTHER_FILES_DIR)
   endif
 endif
 
--- a/make/GensrcModuleInfo.gmk	Mon Sep 12 09:38:26 2016 -0700
+++ b/make/GensrcModuleInfo.gmk	Thu Sep 15 13:14:36 2016 -0700
@@ -104,20 +104,28 @@
     $(eval split_line := $(subst /,$(SPACE),$(line))) \
     $(eval command := $(word 1, $(split_line))) \
     $(if $(filter $(command), exports), \
+      $(eval modifier := $(word 2, $(split_line))) \
       $(eval package := $(patsubst %;,%,$(word 2, $(split_line)))) \
+      $(eval to_module := $(patsubst %;,%,$(word 4, $(split_line)))) \
+      $(if $(filter $(modifier), private), \
+        $(eval package := $(patsubst %;,%,$(word 3, $(split_line)))) \
+        $(eval to_module := $(patsubst %;,%,$(word 5, $(split_line)))) \
+        $(eval cmd := $(command)-$(modifier)) \
+      , \
+        $(eval cmd := $(command)) \
+      ) \
       $(if $(call PackageExists, $(package)), \
-        $(eval to_module := $(patsubst %;,%,$(word 4, $(split_line)))) \
         $(if $(to_module), \
-          $(eval ARGS += -$(command) $(package)/$(to_module)) \
+          $(eval ARGS += --$(cmd) $(package)/$(to_module)) \
         , \
-          $(eval ARGS += -$(command) $(package)) \
+          $(eval ARGS += --$(cmd) $(package)) \
         ) \
       ) \
     , \
       $(if $(filter $(command), provides), \
         $(eval provider := $(patsubst %;,%,$(word 2, $(split_line)))) \
         $(eval class := $(patsubst %;,%,$(word 4, $(split_line)))) \
-        $(eval ARGS += -$(command) $(provider)/$(class)) \
+        $(eval ARGS += --$(command) $(provider)/$(class)) \
       , \
         $(error A module-info.extra in $(MODULE) contains invalid command $(command)) \
       ) \
--- a/make/common/Modules.gmk	Mon Sep 12 09:38:26 2016 -0700
+++ b/make/common/Modules.gmk	Thu Sep 15 13:14:36 2016 -0700
@@ -227,6 +227,7 @@
 	          /requires/ { sub(/;/, ""); \
 	                       sub(/requires/, ""); \
 	                       sub(/public/, ""); \
+	                       sub(/transitive/, ""); \
 	                       sub(/\/\/.*/, ""); \
 	                       sub(/\/\*.*\*\//, ""); \
 	                       gsub(/^ +\*.*/, ""); \
--- a/test/failure_handler/src/share/classes/jdk/test/failurehandler/jtreg/GatherDiagnosticInfoObserver.java	Mon Sep 12 09:38:26 2016 -0700
+++ b/test/failure_handler/src/share/classes/jdk/test/failurehandler/jtreg/GatherDiagnosticInfoObserver.java	Thu Sep 15 13:14:36 2016 -0700
@@ -26,8 +26,7 @@
 import com.sun.javatest.Harness;
 import com.sun.javatest.Parameters;
 import com.sun.javatest.TestResult;
-import com.sun.javatest.regtest.RegressionParameters;
-import com.sun.javatest.regtest.OS;
+import com.sun.javatest.InterviewParameters;
 import jdk.test.failurehandler.*;
 
 import java.io.File;
@@ -119,7 +118,7 @@
     @Override
     public void startingTestRun(Parameters params) {
         // TODO find a better way to get JDKs
-        RegressionParameters rp = (RegressionParameters) params;
+        InterviewParameters rp = (InterviewParameters) params;
         Map<?,?> map = new HashMap<>();
         rp.save(map);
         compileJdk = (String) map.get("regtest.compilejdk");
--- a/test/failure_handler/src/share/classes/jdk/test/failurehandler/jtreg/GatherProcessInfoTimeoutHandler.java	Mon Sep 12 09:38:26 2016 -0700
+++ b/test/failure_handler/src/share/classes/jdk/test/failurehandler/jtreg/GatherProcessInfoTimeoutHandler.java	Thu Sep 15 13:14:36 2016 -0700
@@ -23,7 +23,6 @@
 
 package jdk.test.failurehandler.jtreg;
 
-import com.sun.javatest.regtest.OS;
 import com.sun.javatest.regtest.TimeoutHandler;
 import jdk.test.failurehandler.*;
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/failure_handler/src/share/classes/jdk/test/failurehandler/jtreg/OS.java	Thu Sep 15 13:14:36 2016 -0700
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+
+package jdk.test.failurehandler.jtreg;
+
+// Stripped down version of jtreg internal class com.sun.javatest.regtest.config.OS
+class OS {
+    public final String family;
+
+    private static OS current;
+
+    public static OS current() {
+        if (current == null) {
+            String name = System.getProperty("os.name");
+            current = new OS(name);
+        }
+        return current;
+    }
+
+    public OS(String name) {
+
+        if (name.startsWith("Linux"))
+            family = "linux";
+        else if (name.startsWith("Mac") || name.startsWith("Darwin"))
+            family = "mac";
+        else if (name.startsWith("SunOS") || name.startsWith("Solaris"))
+            family = "solaris";
+        else if (name.startsWith("Windows"))
+            family = "windows";
+        else
+            family = name.replaceFirst("^([^ ]+).*", "$1"); // use first word of name
+    }
+}
+
+