diff --git a/jck/agent-drive.sh b/jck/agent-drive.sh index 9cafac67f1..555164a10d 100644 --- a/jck/agent-drive.sh +++ b/jck/agent-drive.sh @@ -1,14 +1,80 @@ #!/bin/bash -echo "Starting JCK agent.." -eval $1 +if [ $# -eq 2 ]; then + echo "Starting JCK agent.." + eval $1 + pid=$! + echo "Agent started with PID $pid" + + echo "Starting JCK harness.." + eval $2 -pid=$! + echo "Test complete. Stopping JCK Agent.." + kill -9 $pid +elif [ $# -eq 4 ]; then + echo "Starting RMI Registry.." + eval $1 + pid1=$! + echo "RMI Registry started with PID $pid1" -echo "Agent started with PID $pid" + echo "Starting RMID.." + eval $2 + pid2=$! + echo "RMID started with PID $pid2" + + echo "Starting JCK agent.." + eval $3 + pid3=$! + echo "Agent started with PID $pid3" + + echo "Starting JCK harness.." + eval $4 + + echo "Test complete." + + echo "Stopping RMI Registry.." + kill -9 $pid1 + + echo "Stopping RMID.." + kill -9 $pid2 + + echo "Stopping JCK Agent.." + kill -9 $pid3 +elif [ $# -eq 5 ]; then + echo "Starting RMI Registry.." + eval $1 + pid1=$! + echo "RMI Registry started with PID $pid1" -echo "Starting JCK harness.." -eval $2 - -echo "Test complete. Stopping JCK Agent.." -kill -9 $pid + echo "Starting RMID.." + eval $2 + pid2=$! + echo "RMID started with PID $pid2" + + echo "Starting TNAMESERV.." + eval $3 + pid3=$! + echo "TNAMESERV started with PID $pid3" + + echo "Starting JCK agent.." + eval $4 + pid4=$! + echo "Agent started with PID $pid4" + + echo "Starting JCK harness.." + eval $5 + + echo "Test complete." + + echo "Stopping RMI Registry.." + kill -9 $pid1 + + echo "Stopping RMID.." + kill -9 $pid2 + + echo "Stopping TNAMESERV.." + kill -9 $pid3 + + echo "Stopping JCK Agent.." + kill -9 $pid4 +fi diff --git a/jck/compiler.api/playlist.xml b/jck/compiler.api/playlist.xml index a94c52423d..048817255f 100644 --- a/jck/compiler.api/playlist.xml +++ b/jck/compiler.api/playlist.xml @@ -83,7 +83,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/javax_tools testsuite=COMPILER; \ + $(GEN_JTB_GENERIC) tests=api/javax_tools testsuite=COMPILER; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/javax_tools testsuite=COMPILER; \ $(TEST_STATUS) sanity @@ -105,7 +107,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/signaturetest testsuite=COMPILER; \ + $(GEN_JTB_GENERIC) tests=api/signaturetest testsuite=COMPILER; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/signaturetest testsuite=COMPILER; \ $(TEST_STATUS) sanity diff --git a/jck/devtools.java2schema/playlist.xml b/jck/devtools.java2schema/playlist.xml index 628fa146d7..2e6242be76 100644 --- a/jck/devtools.java2schema/playlist.xml +++ b/jck/devtools.java2schema/playlist.xml @@ -35,7 +35,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=java2schema/DefaultMapping testsuite=DEVTOOLS; \ + $(GEN_JTB_GENERIC) tests=java2schema/DefaultMapping testsuite=DEVTOOLS; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=java2schema/DefaultMapping testsuite=DEVTOOLS; \ $(TEST_STATUS) sanity diff --git a/jck/devtools.schema_bind/playlist.xml b/jck/devtools.schema_bind/playlist.xml index 43259b9849..dc63aee0d1 100644 --- a/jck/devtools.schema_bind/playlist.xml +++ b/jck/devtools.schema_bind/playlist.xml @@ -53,7 +53,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=schema_bind/bind_factoryMethod testsuite=DEVTOOLS; \ + $(GEN_JTB_GENERIC) tests=schema_bind/bind_factoryMethod testsuite=DEVTOOLS; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=schema_bind/bind_factoryMethod testsuite=DEVTOOLS; \ $(TEST_STATUS) sanity diff --git a/jck/jck.mk b/jck/jck.mk index a8e2e8dd4d..452169afbf 100644 --- a/jck/jck.mk +++ b/jck/jck.mk @@ -119,16 +119,34 @@ ifneq ($(filter aix_ppc-64 zos_390 linux_ppc-64_le linux_390-64, $(SPEC)),) START_HARNESS = ssh -o StrictHostKeyChecking=no jenkins@$(AGENT_NODE) $(REFERENCE_JAVA_CMD) -jar $(JCK_ROOT)$(D)JCK-runtime-$(JCK_VERSION_NUMBER)$(D)lib$(D)javatest.jar -config $(WORKSPACE)$(D)compiler.jti @$(WORKSPACE)$(D)generated.jtb else REFERENCE_JAVA_CMD=$(TEST_ROOT)/../additionaljdkbinary/bin/java - GEN_JTB = $(REFERENCE_JAVA_CMD) -Djvm.options=$(Q)$(JVM_OPTIONS)$(Q) -Dother.opts=$(Q)$(OTHER_OPTS)$(Q) -cp $(TEST_ROOT)$(D)jck$(D)jtrunner$(D)bin JavatestUtil testRoot=$(TEST_ROOT) jckRoot=$(JCK_ROOT) jckversion=$(JCK_VERSION) testJava=$(JAVA_TO_TEST) riJava=$(REFERENCE_JAVA_CMD) workdir=$(REPORTDIR) configAltPath=$(CONFIG_ALT_PATH) agentHost=localhost task=cmdfilegen testExecutionType=multijvm + GEN_JTB = $(REFERENCE_JAVA_CMD) -Djvm.options=$(Q)$(JVM_OPTIONS)$(Q) -Dother.opts=$(Q)$(OTHER_OPTS)$(Q) -cp $(TEST_ROOT)$(D)jck$(D)jtrunner$(D)bin JavatestUtil testRoot=$(TEST_ROOT) jckRoot=$(JCK_ROOT) jckversion=$(JCK_VERSION) testJava=$(JAVA_TO_TEST) riJava=$(REFERENCE_JAVA_CMD) workdir=$(REPORTDIR) configAltPath=$(CONFIG_ALT_PATH) task=cmdfilegen testExecutionType=multijvm GEN_SUMMARY = $(JAVA_TO_TEST) -Djvm.options=$(Q)$(JVM_OPTIONS)$(Q) -Dother.opts=$(Q)$(OTHER_OPTS)$(Q) -cp $(TEST_ROOT)$(D)jck$(D)jtrunner$(D)bin JavatestUtil testRoot=$(TEST_ROOT) jckRoot=$(JCK_ROOT) jckversion=$(JCK_VERSION) configAltPath=$(CONFIG_ALT_PATH) workdir=$(REPORTDIR) task=summarygen START_AGENT = $(JAVA_TO_TEST) -Djavatest.security.allowPropertiesAccess=true -Djava.security.policy=$(JCK_ROOT)$(D)JCK-compiler-$(JCK_VERSION_NUMBER)$(D)lib$(D)jck.policy -classpath $(Q)$(JCK_ROOT)$(D)JCK-compiler-$(JCK_VERSION_NUMBER)$(D)lib$(D)javatest.jar$(P)$(JCK_ROOT)$(D)JCK-compiler-$(JCK_VERSION_NUMBER)$(D)classes$(Q) com.sun.javatest.agent.AgentMain -passive -trace &> $(REPORTDIR)$(D)agent.log & START_HARNESS = $(REFERENCE_JAVA_CMD) -jar $(JCK_ROOT)$(D)JCK-runtime-$(JCK_VERSION_NUMBER)$(D)lib$(D)javatest.jar -config $(CONFIG_ALT_PATH)$(D)jck$(JCK_VERSION_NUMBER)$(D)compiler.jti @$(REPORTDIR)$(D)generated.jtb endif -define START_MULTI_JVM_COMP_TEST -chmod +x $(TEST_ROOT)$(D)jck$(D)agent-drive.sh; \ -$(TEST_ROOT)$(D)jck$(D)agent-drive.sh '$(START_AGENT)' '$(START_HARNESS)' -endef +$(shell chmod +x $(TEST_ROOT)$(D)jck$(D)agent-drive.sh) + +START_MULTI_JVM_COMP_TEST = $(TEST_ROOT)$(D)jck$(D)agent-drive.sh '$(START_AGENT)' '$(START_HARNESS)' +GEN_JTB_GENERIC = $(JAVA_TO_TEST) -Djvm.options=$(Q)$(JVM_OPTIONS)$(Q) -Dother.opts=$(Q)$(OTHER_OPTS)$(Q) -cp $(TEST_ROOT)/jck/jtrunner/bin JavatestUtil testRoot=$(TEST_ROOT) jckRoot=$(JCK_ROOT) jckversion=$(JCK_VERSION) workdir=$(REPORTDIR) configAltPath=$(CONFIG_ALT_PATH) task=cmdfilegen spec=$(SPEC) +GEN_SUMMARY_GENERIC = $(JAVA_TO_TEST) -Djvm.options=$(Q)$(JVM_OPTIONS)$(Q) -Dother.opts=$(Q)$(OTHER_OPTS)$(Q) -cp $(TEST_ROOT)/jck/jtrunner/bin JavatestUtil testRoot=$(TEST_ROOT) jckRoot=$(JCK_ROOT) jckversion=$(JCK_VERSION) configAltPath=$(CONFIG_ALT_PATH) workdir=$(REPORTDIR) task=summarygen spec=$(SPEC) +START_AGENT_GENERIC = $(JAVA_TO_TEST) -Djavatest.security.allowPropertiesAccess=true -Djava.security.policy=$(JCK_ROOT)/JCK-runtime-$(JCK_VERSION_NUMBER)/lib/jck.policy -classpath $(Q)$(JCK_ROOT)/JCK-runtime-$(JCK_VERSION_NUMBER)/lib/javatest.jar$(P)$(JCK_ROOT)/JCK-runtime-$(JCK_VERSION_NUMBER)/classes$(Q) com.sun.javatest.agent.AgentMain -passive -trace &> $(REPORTDIR)/agent.log & +START_RMIREG = $(TEST_JDK_HOME)/bin/rmiregistry +START_RMID = $(TEST_JDK_HOME)/bin/rmid -J-Dsun.rmi.activation.execPolicy=none -J-Djava.security.policy=$(JCK_ROOT)/JCK-runtime-$(JCK_VERSION_NUMBER)/lib/jck.policy +START_TNAMESRV = $(TEST_JDK_HOME)/bin/tnameserv -ORBInitialPort 9876 +EXEC_RUNTIME_TEST = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-runtime-$(JCK_VERSION_NUMBER)/lib/javatest.jar -config $(CONFIG_ALT_PATH)/$(JCK_VERSION)/runtime.jti @$(REPORTDIR)/generated.jtb +EXEC_COMP_TEST = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-compiler-$(JCK_VERSION_NUMBER)/lib/javatest.jar -config $(CONFIG_ALT_PATH)/$(JCK_VERSION)/compiler.jti @$(REPORTDIR)/generated.jtb +EXEC_DEVTOOLS_TEST = $(JAVA_TO_TEST) -jar $(JCK_ROOT)/JCK-devtools-$(JCK_VERSION_NUMBER)/lib/javatest.jar -config $(CONFIG_ALT_PATH)/$(JCK_VERSION)/devtools.jti @$(REPORTDIR)/generated.jtb +EXEC_RUNTIME_TEST_WITH_AGENT = $(TEST_ROOT)/jck/agent-drive.sh '$(START_AGENT_GENERIC)' '$(EXEC_RUNTIME_TEST)' +EXEC_RUNTIME_TEST_WITH_SERVICES = $(EXEC_RUNTIME_TEST) + +ifeq ($(JDK_VERSION), 8) + EXEC_RUNTIME_TEST_WITH_SERVICES = $(TEST_ROOT)/jck/agent-drive.sh '$(START_AGENT_GENERIC)' '$(START_RMIREG)' '$(START_RMID)' '$(START_TNAMESRV)' '$(EXEC_RUNTIME_TEST)' +endif + +ifeq ($(JDK_VERSION), 11) + EXEC_RUNTIME_TEST_WITH_SERVICES = $(TEST_ROOT)/jck/agent-drive.sh '$(START_RMIREG)' '$(START_RMID)' '$(START_AGENT_GENERIC)' '$(EXEC_RUNTIME_TEST)' +endif ifeq (8, $(JDK_VERSION)) COMPILER_LANG_CLASS_TESTS_GROUP1=$(Q)lang/CLSS/clss426;lang/CLSS/clss419;lang/CLSS/clss089;lang/CLSS/clss421;lang/CLSS/clss045;lang/CLSS/clss087;lang/CLSS/clss073;lang/CLSS/clss417;lang/CLSS/clss428;lang/CLSS/clss410;lang/CLSS/clss074;lang/CLSS/clss444;lang/CLSS/clss020;lang/CLSS/clss212;lang/CLSS/clss018;lang/CLSS/clss215;lang/CLSS/clss027;lang/CLSS/clss443;lang/CLSS/clss481;lang/CLSS/clss475;lang/CLSS/clss223;lang/CLSS/clss011;lang/CLSS/clss029;lang/CLSS/clss016;lang/CLSS/clss224;lang/CLSS/clss472;lang/CLSS/clss411;lang/CLSS/clss075;lang/CLSS/clss072;lang/CLSS/clss416;lang/CLSS/clss086$(Q) diff --git a/jck/jtrunner/JavatestUtil.java b/jck/jtrunner/JavatestUtil.java index cd57780c08..57b423d80d 100644 --- a/jck/jtrunner/JavatestUtil.java +++ b/jck/jtrunner/JavatestUtil.java @@ -64,11 +64,11 @@ public class JavatestUtil { private static String jtiFile; private static String nativesLoc; private static String jckConfigLoc; - private static String initialJtxFullPath; - private static String jtxFullPath; - private static String kflFullPath; - private static String fipsJtxFullPath; - private static String krbConfFile; + private static String initialJtxFullPath = ""; + private static String defaultJtxFullPath = ""; + private static String kflFullPath = ""; + private static String customJtx = ""; + private static String krbConfFile = ""; private static String fileUrl; private static String jckPolicyFileFullPath; @@ -99,6 +99,8 @@ public class JavatestUtil { private static String agentHost; private static String testJavaForMultiJVMCompTest; private static String riJavaForMultiJVMCompTest; + private static String spec; + private static String osShortName; private static HashMap testArgs = new HashMap(); private static String jvmOpts = ""; @@ -107,8 +109,6 @@ public class JavatestUtil { private static String suppressOutOfMemoryDumpOptions = ""; private static int freePort; - private static String archName = System.getProperty("os.arch"); - private static String platform = getOSNameShort(); private static final String TEST_ROOT = "testRoot"; private static final String JCK_ROOT = "jckRoot"; @@ -128,6 +128,8 @@ public class JavatestUtil { private static final String TEST_JAVA_FOR_MULTIJVM_COMP_TEST = "testJava"; private static final String RI_JAVA_FOR_MULTIJVM_COMP_TEST = "riJava"; private static final String WORK_DIR = "workdir"; + private static final String SPEC = "spec"; + private static final String CUSTOM_JTX = "customJtx"; public static void main(String args[]) throws Exception { ArrayList essentialParameters = new ArrayList(); @@ -147,6 +149,8 @@ public static void main(String args[]) throws Exception { essentialParameters.add(TEST_JAVA_FOR_MULTIJVM_COMP_TEST); essentialParameters.add(RI_JAVA_FOR_MULTIJVM_COMP_TEST); essentialParameters.add(WORK_DIR); + essentialParameters.add(SPEC); + essentialParameters.add(CUSTOM_JTX); for (String arg : args) { if (arg.contains("=")) { @@ -183,9 +187,13 @@ public static void main(String args[]) throws Exception { jvmOpts = System.getProperty("jvm.options").trim() + " " + System.getProperty("other.opts"); testFlag = System.getenv("TEST_FLAG"); task = testArgs.get(TASK).trim(); - - if (task.equals("cmdfilegen")) { - agentHost = testArgs.get(AGENT_HOST).trim(); + customJtx = testArgs.get(CUSTOM_JTX) == null ? "" : testArgs.get(CUSTOM_JTX); + spec = testArgs.get(SPEC); + osShortName = getOSNameShort(); + + if (osShortName == null) { + System.out.println("Unknown spec value supplied : " + spec); + System.exit(1); } testJdk = System.getenv("JAVA_HOME"); @@ -193,38 +201,32 @@ public static void main(String args[]) throws Exception { jckVersion = testArgs.get(JCK_VERSION); jckRoot = new File(testArgs.get(JCK_ROOT)).getCanonicalPath(); testSuite = testArgs.get(TEST_SUITE); - testExecutionType = testArgs.get(TEST_EXECUTION_TYPE) == null ? "multijvm" : testArgs.get(TEST_EXECUTION_TYPE); + testExecutionType = testArgs.get(TEST_EXECUTION_TYPE) == null ? "default" : testArgs.get(TEST_EXECUTION_TYPE); withAgent = testArgs.get(WITH_AGENT) == null ? "off" : testArgs.get(WITH_AGENT); interactive = testArgs.get(INTERACTIVE) == null ? "no" : testArgs.get(INTERACTIVE); concurrencyString = testArgs.get("concurrency") == null ? "NULL" : testArgs.get("concurrency"); config = testArgs.get(CONFIG) == null ? "NULL" : testArgs.get(CONFIG); configAltPath = testArgs.get(CONFIG_ALT_PATH) == null ? "NULL" : testArgs.get(CONFIG_ALT_PATH); + agentHost = testArgs.get(AGENT_HOST) == null ? "localhost" : testArgs.get(AGENT_HOST).trim(); testRoot = new File(testArgs.get(TEST_ROOT)).getCanonicalPath(); testJavaForMultiJVMCompTest = testArgs.get(TEST_JAVA_FOR_MULTIJVM_COMP_TEST); riJavaForMultiJVMCompTest = testArgs.get(RI_JAVA_FOR_MULTIJVM_COMP_TEST); workDir = testArgs.get(WORK_DIR); - jckVersionNo = jckVersion.replace("jck", ""); - testSuiteFolder = "JCK-" + testSuite.toString().toLowerCase() + "-" + jckVersionNo; jckBase = jckRoot + File.separator + testSuiteFolder; jckPolicyFileFullPath = jckBase + File.separator + "lib" + File.separator + "jck.policy"; javatestJarFullPath = jckBase + File.separator + "lib" + File.separator + "javatest.jar"; jtliteJarFullPath = jckBase + File.separator + "lib" + File.separator + "jtlite.jar"; classesFullPath = jckBase + File.separator + "classes"; - nativesLoc = jckRoot + File.separator + "natives" + File.separator + platform; - + nativesLoc = jckRoot + File.separator + "natives" + File.separator + osShortName; reportDir = workDir + File.separator + "report"; newJtbFileRef = workDir + File.separator + "generated.jtb"; - jtiFile = configAltPath + File.separator + jckVersion + File.separator + testSuite.toLowerCase() + ".jti"; - fileUrl = "file:///" + jckBase + "/testsuite.jtt"; - - // The first release of a JCK will have an initial excludes (.jtx) file in test-suite/lib - e.g. JCK-runtime-8b/lib/jck8b.jtx. - // Updates to the excludes list may subsequently be supplied as a separate file, which supersedes the initial file. - // A known failures list (.kfl) file is optional. - // The automation here adds any files found (initial or updates) as 'custom' files. - initialJtxFullPath = jckBase + "/lib/" + jckVersion + ".jtx"; + // Solaris natives are in /natives/sunos + if (spec.contains("solaris")) { + nativesLoc = jckRoot + File.separator + "natives" + File.separator + "sunos"; + } File f = new File(jckRoot); File[] files = f.listFiles(); @@ -247,11 +249,6 @@ public static void main(String args[]) throws Exception { System.out.println("Cannot locate the JCK artifacts under : " + jckRoot); System.exit(1); } - - // Solaris natives are in /natives/sunos - if (platform.equals("solaris")) { - nativesLoc = jckRoot + File.separator + "natives" + File.separator + "sunos"; - } try { if (task.equals(TASK_GENERATE_SUMMARY_REPORT)) { @@ -265,50 +262,47 @@ public static void main(String args[]) throws Exception { System.exit(1); } + jtiFile = configAltPath + File.separator + jckVersion + File.separator + testSuite.toLowerCase() + ".jti"; System.out.println("Using jti file "+ jtiFile); - File initialJtxFile = new File(initialJtxFullPath); - - if (initialJtxFile.exists()) { - System.out.println("Using initial excludes list file " + initialJtxFullPath); + if (spec.contains("win")) { + // Jck fileURL validator validates using java.net.URI, so must use forward slashes "/" + fileUrl = "file:///" + jckBase.replace("\\","/") + "/testsuite.jtt"; + } else { + fileUrl = "file:///" + jckBase + "/testsuite.jtt"; + } + + // The first release of a JCK will have an initial excludes (.jtx) file in test-suite/lib - e.g. JCK-runtime-8b/lib/jck8b.jtx. + // Updates to the excludes list may subsequently be supplied as a separate file, which supersedes the initial file. + // A known failures list (.kfl) file is optional. + // The automation here adds any files found (initial or updates) as 'custom' files. + initialJtxFullPath = jckBase + "/lib/" + jckVersion + ".jtx"; + if (new File(initialJtxFullPath).exists()) { + System.out.println("Using initial jtx file:" + initialJtxFullPath); } else { - System.out.println("Unable to find initial excludes list file " + initialJtxFullPath); initialJtxFullPath = ""; } - - jtxFullPath = jckRoot + File.separator + "excludes" + File.separator + jckVersion + ".jtx"; - File jtxFile = new File(jtxFullPath); - if (jtxFile.exists()) { - System.out.println("Using additional excludes list file " + jtxFullPath); + // Include any default jtx file that came as part of tck repo + defaultJtxFullPath = jckRoot + File.separator + "excludes" + File.separator + jckVersion + ".jtx"; + if (new File(defaultJtxFullPath).exists()) { + System.out.println("Using default jtx file:" + defaultJtxFullPath); } else { - System.out.println("Unable to find additional excludes list file " + jtxFullPath); - jtxFullPath = ""; + defaultJtxFullPath = ""; } - - // Look for a known failures list file - kflFullPath = jckRoot + File.separator + "excludes" + File.separator + jckVersion + ".kfl"; - File kflFile = new File(kflFullPath); - if (kflFile.exists()) { - System.out.println("Using known failures list file " + kflFullPath); + // Include any known failures list(kfl) file if it came with the tck repo + kflFullPath = jckRoot + File.separator + "excludes" + File.separator + jckVersion + ".kfl"; + if (new File(kflFullPath).exists()) { + System.out.println("Using kfl file: " + kflFullPath); } else { - System.out.println("Unable to find known failures list file " + kflFullPath); kflFullPath = ""; } - fipsJtxFullPath = ""; - if (testFlag != null && testFlag.equals("FIPS")) { - // Look for a known failures list file specific to FIPS testing - fipsJtxFullPath = jckRoot + File.separator + "excludes" + File.separator + jckVersion + "-fips.jtx"; - File fipsJtxFile = new File(fipsJtxFullPath); - - if (fipsJtxFile.exists()) { - System.out.println("Using FIPS specific failures list file " + fipsJtxFullPath); - } else { - System.out.println("Unable to find FIPS specific failures list file " + fipsJtxFullPath); - fipsJtxFullPath = ""; - } + if (customJtx != "") { + System.out.println("Using custom exclude file(s): " + customJtx); + } else { + customJtx = ""; } try { @@ -431,7 +425,7 @@ private static boolean generateJTB() throws Exception { String pathToJavac = testJdk + File.separator + "bin" + File.separator + "javac"; String pathToToolsJar = testJdk + File.separator + "lib" + File.separator + "tools.jar"; // Use escaped backslashes for paths on Windows - if (platform.contains("win")) { + if (spec.contains("win")) { pathToJava = pathToJava.replace("/", "\\") + ".exe"; pathToRmic = pathToRmic.replace("/", "\\") + ".exe"; pathToLib = pathToLib.replace("/", "\\"); @@ -472,7 +466,7 @@ private static boolean generateJTB() throws Exception { concurrencyString = String.valueOf(concurrency); } - if (platform.contains("zos")) { + if (spec.contains("zos")) { extraJvmOptions += " -Dfile.encoding=US-ASCII"; } @@ -489,30 +483,30 @@ private static boolean generateJTB() throws Exception { keyword = "keywords !interactive"; } - if (platform.contains("win")) { + if (spec.contains("win")) { libPath = "PATH"; robotAvailable = "Yes"; - } else if (platform.contains("alpine-linux")) { + } else if (spec.contains("alpine-linux")) { libPath = "LD_LIBRARY_PATH"; robotAvailable = "No"; - } else if (platform.contains("linux")) { + } else if (spec.contains("linux")) { libPath = "LD_LIBRARY_PATH"; robotAvailable = "Yes"; - } else if (platform.contains("aix")) { + } else if (spec.contains("aix")) { libPath = "LIBPATH"; robotAvailable = "Yes"; - } else if (platform.contains("zos")) { + } else if (spec.contains("zos")) { pathToLib = testJdk + File.separator + "lib"; libPath = "LIBPATH"; robotAvailable = "No"; - } else if (platform.contains("osx")) { + } else if (spec.contains("osx")) { libPath = "DYLD_LIBRARY_PATH"; robotAvailable = "Yes"; - } else if (platform.contains("solaris")) { + } else if (spec.contains("sunos")) { libPath = "LD_LIBRARY_PATH"; robotAvailable = "Yes"; } else { - System.out.println("Unknown platform:: " + platform); + System.out.println("Unknown spec: " + spec); return false; } @@ -520,7 +514,7 @@ private static boolean generateJTB() throws Exception { fileContent += "timeoutfactor 4" + ";\n"; // 4 base time limit equal 40 minutes fileContent += keyword + ";\n"; - if (platform.equals("win")) { + if (spec.contains("win")) { // On Windows set the testplatform.os to Windows and set systemRoot, but do not // set the file and path separators (an error is thrown if they are set). fileContent += "set jck.env.testPlatform.os \"Windows\";\n"; @@ -534,17 +528,17 @@ private static boolean generateJTB() throws Exception { } if ( testsRequireDisplay(tests) ) { - if (platform.equals("zos") || platform.equals("alpine-linux")) { + if (spec.contains("zos") || spec.contains("alpine-linux")) { fileContent += "set jck.env.testPlatform.headless Yes" + ";\n"; } else { - if ( !platform.equals("win") ) { + if ( !spec.contains("win") ) { fileContent += "set jck.env.testPlatform.headless No" + ";\n"; fileContent += "set jck.env.testPlatform.xWindows Yes" + ";\n"; - if ( !platform.equals("osx") ) { + if ( !spec.contains("osx") ) { String display = System.getenv("DISPLAY"); if ( display == null ) { - System.out.println("Error: DISPLAY must be set to run tests " + tests + " on " + platform); + System.out.println("Error: DISPLAY must be set to run tests " + tests + " on " + spec); return false; } else { @@ -559,7 +553,7 @@ private static boolean generateJTB() throws Exception { keyword += "&!robot"; } - if ( !platform.equals("win") && (tests.contains("api/signaturetest") || tests.contains("api/java_io")) ) { + if ( !spec.contains("win") && (tests.contains("api/signaturetest") || tests.contains("api/java_io")) ) { fileContent += "set jck.env.testPlatform.xWindows \"No\"" + ";\n"; } @@ -685,7 +679,7 @@ private static boolean generateJTB() throws Exception { fileContent += "set jck.env.runtime.testExecute.otherOpts \" " + extraJvmOptions + " \"" + ";\n"; // Tests that need Display on OSX also require AWT_FORCE_HEADFUL=true - if (platform.equals("osx")) { + if (spec.contains("osx")) { fileContent += "set jck.env.runtime.testExecute.otherEnvVars \" AWT_FORCE_HEADFUL=true \"" + ";\n"; } } @@ -696,7 +690,7 @@ private static boolean generateJTB() throws Exception { keyword = "keywords compiler"; // Overrides only required on zOS for compiler tests - if (platform.equals("zos")) { + if (spec.contains("zos")) { pathToLib = testJdk + File.separator + "lib"; } @@ -704,20 +698,28 @@ private static boolean generateJTB() throws Exception { fileContent += "timeoutfactor 100" + ";\n"; // lang.CLSS,CONV,STMT,INFR requires more than 1h to complete. lang.Annot,EXPR,LMBD require more than 2h to complete tests fileContent += keyword + ";\n"; - if (testExecutionType != null && testExecutionType.equals("multijvm")) { + if (testExecutionType.equals("multijvm")) { fileContent += "set jck.env.testPlatform.useAgent \"Yes\";\n"; fileContent += "set jck.env.compiler.agent.agentType \"passive\";\n"; fileContent += "set jck.env.compiler.agent.passiveHost \"" + agentHost + "\"" + ";\n"; fileContent += "set jck.env.compiler.agent.passivePortDefault \"Yes\";\n"; + } else if (tests.contains("api/java_net") || tests.contains("api/org_omg") || tests.contains("api/javax_management") || tests.contains("api/javax_xml") || tests.contains("vm/jdwp") || tests.equals("api")) { + if (!tests.contains("api/javax_xml/bind") && + !tests.contains("api/javax_xml/soap") && + !tests.contains("api/org_omg/PortableInterceptor") && + !tests.contains("api/org_omg/PortableServer") ) { + fileContent += "set jck.env.runtime.remoteAgent.passiveHost localhost" + ";\n"; + fileContent += "set jck.env.runtime.remoteAgent.passivePortDefault Yes" + ";\n"; + } } String cmdAsStringOrFile = "cmdAsString"; // Whether to reference cmd via cmdAsString or cmdAsFile - if (platform.equals("win")) { + if (spec.contains("win")) { // On Windows set the testplatform.os to Windows and set systemRoot, but do not // set the file and path separators (an error is thrown if they are set). fileContent += "set jck.env.testPlatform.os \"Windows\";\n"; fileContent += "set jck.env.testPlatform.systemRoot " + System.getenv("WINDIR") + ";\n"; - } else if (!jckVersion.contains("jck8") && (platform.equals("zos") || platform.equals("aix"))) { + } else if (!jckVersion.contains("jck8") && (spec.contains("zos") || spec.contains("aix"))) { // On jck11+ z/OS and AIX set the testplatform.os Current system // due to JCK class OsHelper bug with getFileSep() in Compiler JCK Interviewer fileContent += "set jck.env.testPlatform.os \"Current system\";\n"; @@ -752,7 +754,7 @@ private static boolean generateJTB() throws Exception { fileContent += "set jck.env.compiler.compRefExecute." + cmdAsStringOrFile + " \"" + riJavaForMultiJVMCompTest + "\"" + ";\n"; - if (!jckVersion.contains("jck8") && (platform.equals("zos") || platform.equals("aix"))) { + if (!jckVersion.contains("jck8") && (spec.contains("zos") || spec.contains("aix"))) { // On jck11+ z/OS and AIX set the compRefExecute file and path separators // due to JCK class OsHelper bug with getFileSep() in Compiler JCK Interviewer fileContent += "set jck.env.compiler.compRefExecute.fileSep \"/\";\n"; @@ -776,7 +778,7 @@ private static boolean generateJTB() throws Exception { String jxcCmd = ""; // Required for "java2schema" test String genCmd,impCmd = ""; // Required for "jaxws" test - if (platform.equals("win")) { + if (spec.contains("win")) { String winscriptdir; if ( jckVersion.contains("jck6") || jckVersion.contains("jck7") || jckVersion.contains("jck8") || jckVersion.contains("jck9") ) { winscriptdir="win32"; @@ -791,32 +793,32 @@ private static boolean generateJTB() throws Exception { jxcCmd = jxcCmd.replace("/", "\\"); genCmd = genCmd.replace("/", "\\"); impCmd = impCmd.replace("/", "\\"); - } else if (platform.contains("linux") || platform.equals("aix")) { + } else if (spec.contains("linux") || spec.contains("aix")) { xjcCmd = jckBase + File.separator + "linux" + File.separator + "bin" + File.separator + "xjc.sh"; jxcCmd = jckBase + File.separator + "linux" + File.separator + "bin" + File.separator + "schemagen.sh"; genCmd = jckBase + File.separator + "linux" + File.separator + "bin" + File.separator + "wsgen.sh"; impCmd = jckBase + File.separator + "linux" + File.separator + "bin" + File.separator + "wsimport.sh"; - } else if (platform.equals("osx")) { + } else if (spec.contains("osx")) { xjcCmd = jckBase + File.separator + "macos" + File.separator + "bin" + File.separator + "xjc.sh"; jxcCmd = jckBase + File.separator + "macos" + File.separator + "bin" + File.separator + "schemagen.sh"; genCmd = jckBase + File.separator + "macos" + File.separator + "bin" + File.separator + "wsgen.sh"; impCmd = jckBase + File.separator + "macos" + File.separator + "bin" + File.separator + "wsimport.sh"; - } else if (platform.equals("zos") || platform.equals("solaris")) { + } else if (spec.contains("zos") || spec.contains("solaris")) { pathToJavac = testJdk + File.separator + "bin" + File.separator + "javac"; xjcCmd = jckBase + File.separator + "solaris" + File.separator + "bin" + File.separator + "xjc.sh"; jxcCmd = jckBase + File.separator + "solaris" + File.separator + "bin" + File.separator + "schemagen.sh"; genCmd = jckBase + File.separator + "solaris" + File.separator + "bin" + File.separator + "wsgen.sh"; impCmd = jckBase + File.separator + "solaris" + File.separator + "bin" + File.separator + "wsimport.sh"; } else { - System.out.println("Unknown platform:: " + platform); + System.out.println("Unknown spec: " + spec); return false; } // bash/ksh required to run schema scripts (cannot be standard sh) - if (platform.equals("linux")) { + if (spec.contains("linux")) { xjcCmd = "bash "+xjcCmd; jxcCmd = "bash "+jxcCmd; - } else if (platform.equals("solaris")) { + } else if (spec.contains("solaris")) { xjcCmd = "ksh "+xjcCmd; jxcCmd = "ksh "+jxcCmd; } @@ -824,7 +826,7 @@ private static boolean generateJTB() throws Exception { fileContent += "concurrency " + concurrencyString + ";\n"; fileContent += "timeoutfactor 40" + ";\n"; // All Devtools tests take less than 1h to finish. - if (platform.equals("win")) { + if (spec.contains("win")) { // On Windows set the testplatform.os to Windows and set systemRoot, but do not // set the file and path separators (an error is thrown if they are set). fileContent += "set jck.env.testPlatform.os \"Windows\";\n"; @@ -860,7 +862,14 @@ private static boolean generateJTB() throws Exception { fileContent += "set jck.env.devtools.refExecute.otherOpts \" " + extraJvmOptions + " \"" + ";\n"; } - fileContent += "set jck.excludeList.customFiles \"" + initialJtxFullPath + " " + jtxFullPath + " " + kflFullPath + " " + fipsJtxFullPath + "\"" + ";\n"; + // Only use default initial jtx exclude and disregard the rest of jck exclude lists + // when running a test via jck_custom. + if (task == null || !task.equals("custom")) { + fileContent += "set jck.excludeList.customFiles \"" + initialJtxFullPath + " " + defaultJtxFullPath + " " + kflFullPath + " " + customJtx + "\";\n"; + } else { + fileContent += "set jck.excludeList.customFiles \"" + initialJtxFullPath + " " + defaultJtxFullPath + " " + kflFullPath + "\";\n"; + } + fileContent += "runTests" + ";\n"; fileContent += "writeReport -type xml " + reportDir + ";\n"; @@ -874,7 +883,7 @@ private static boolean generateJTB() throws Exception { bw.flush(); bw.close(); - if (platform.equals("zos")) { + if (spec.contains("zos")) { if(!doIconvFile()) { System.out.println("Failed to convert jtb file encoding for z/OS"); return false; @@ -1152,47 +1161,30 @@ private static String getTestSpecificJvmOptions(String jckVersion, String tests) } private static String getOSNameShort() { - // get the osName and make it lowercase - String osName = System.getProperty("os.name").toLowerCase(); - - // set the shortname to the osName if the current system is Linux - // or AIX this is all that is needed - String osShortName = osName; - - // We need to determine if the platform is Alpine Linux or not - if (osName.equals("linux")) { + // We need to determine if the spec is Alpine Linux or not + if (spec.contains("linux")) { Path alpine = Paths.get("/etc/alpine-release"); if (Files.exists(alpine)) { - osShortName = "alpine-linux"; + return "alpine-linux"; } + return "linux"; } - - // if we are on z/OS remove the slash - if (osName.equals("z/os")) { - osShortName = "zos"; + if (spec.contains("zos")) { + return "zos"; } - - // if we are on a Windows machine use win as the shortname - if (osName.contains("win")) { - osShortName = "win"; + if (spec.contains("win")) { + return "win"; } - - // if we are on a Mac use osx as the shortname - if (osName.contains("mac")) { - osShortName = "osx"; - } - - // if we are on BSD use bsd as the shortname - if (osName.contains("bsd")) { - osShortName = "bsd"; + if (spec.contains("osx")) { + return "osx"; } - - // if we are on sunos use solaris as the shortname - if (osName.contains("sunos")) { - osShortName = "solaris"; + if (spec.contains("aix")) { + return "aix"; } - - return osShortName; + if (spec.contains("sunos")) { + return "solaris"; + } + return null; } private static boolean doIconvFile() throws Exception { diff --git a/jck/runtime.api/playlist.xml b/jck/runtime.api/playlist.xml index 51c4c3e359..97c86c9aac 100644 --- a/jck/runtime.api/playlist.xml +++ b/jck/runtime.api/playlist.xml @@ -53,7 +53,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/java_lang/instrument testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/java_lang/instrument testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/java_lang/instrument testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -67,7 +69,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/java_lang/invoke testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/java_lang/invoke testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/java_lang/invoke testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -81,7 +85,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/java_lang/reflect testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/java_lang/reflect testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/java_lang/reflect testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -95,7 +101,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/java_lang/Package testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/java_lang/Package testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/java_lang/Package testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -109,7 +117,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/java_lang/String testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/java_lang/String testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/java_lang/String testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -123,7 +133,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/java_lang/StringBuilder testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/java_lang/StringBuilder testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/java_lang/StringBuilder testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -137,7 +149,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/java_lang/StringBuffer testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/java_lang/StringBuffer testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/java_lang/StringBuffer testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -151,7 +165,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/java_lang/ClassLoader testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/java_lang/ClassLoader testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/java_lang/ClassLoader testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -165,7 +181,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/java_lang/ModuleLayer testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/java_lang/ModuleLayer testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/java_lang/ModuleLayer testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -182,7 +200,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/java_lang/module testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/java_lang/module testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/java_lang/module testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -199,7 +219,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/java_lang/StackWalker testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/java_lang/StackWalker testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/java_lang/StackWalker testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -216,7 +238,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/java_lang/Module_class testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/java_lang/Module_class testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/java_lang/Module_class testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -233,7 +257,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/java_lang/SecurityManager testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/java_lang/SecurityManager testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/java_lang/SecurityManager testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -247,7 +273,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/java_lang/System testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/java_lang/System testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/java_lang/System testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -261,7 +289,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/java_lang/constant testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/java_lang/constant testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/java_lang/constant testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -278,7 +308,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/java_lang/Class testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/java_lang/Class testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/java_lang/Class testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -292,7 +324,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/signaturetest testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/signaturetest testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/signaturetest testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -306,7 +340,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/modulegraph testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/modulegraph testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/modulegraph testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -331,7 +367,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/java_util/regex testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/java_util/regex testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST_WITH_SERVICES); \ + $(GEN_SUMMARY_GENERIC) tests=api/java_util/regex testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -345,7 +383,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/javax_naming/spi testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/javax_naming/spi testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/javax_naming/spi testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -359,7 +399,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/java_util/ResourceBundle testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/java_util/ResourceBundle testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST_WITH_SERVICES); \ + $(GEN_SUMMARY_GENERIC) tests=api/java_util/ResourceBundle testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -386,7 +428,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/java_applet testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/java_applet testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/java_applet testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -410,7 +454,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/java_awt testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/java_awt testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/java_awt testsuite=RUNTIME; \ $(TEST_STATUS) extended @@ -432,7 +478,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/java_beans testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/java_beans testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/java_beans testsuite=RUNTIME; \ $(TEST_STATUS) extended @@ -461,7 +509,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/java_lang testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/java_lang testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/java_lang testsuite=RUNTIME; \ $(TEST_STATUS) extended @@ -475,7 +525,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/java_math testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/java_math testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/java_math testsuite=RUNTIME; \ $(TEST_STATUS) extended @@ -500,7 +552,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/java_net testsuite=RUNTIME concurrency=1; \ + $(GEN_JTB_GENERIC) tests=api/java_net testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST_WITH_SERVICES); \ + $(GEN_SUMMARY_GENERIC) tests=api/java_net testsuite=RUNTIME; \ $(TEST_STATUS) special @@ -514,7 +568,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/java_nio testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/java_nio testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/java_nio testsuite=RUNTIME; \ $(TEST_STATUS) special @@ -536,7 +592,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/java_rmi testsuite=RUNTIME concurrency=1; \ + $(GEN_JTB_GENERIC) tests=api/java_rmi testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST_WITH_SERVICES); \ + $(GEN_SUMMARY_GENERIC) tests=api/java_rmi testsuite=RUNTIME; \ $(TEST_STATUS) extended @@ -558,7 +616,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/java_security testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/java_security testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/java_security testsuite=RUNTIME; \ $(TEST_STATUS) extended @@ -572,7 +632,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/java_sql testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/java_sql testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/java_sql testsuite=RUNTIME; \ $(TEST_STATUS) extended @@ -586,7 +648,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/java_text testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/java_text testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/java_text testsuite=RUNTIME; \ $(TEST_STATUS) extended @@ -600,7 +664,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/java_time testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/java_time testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/java_time testsuite=RUNTIME; \ $(TEST_STATUS) extended @@ -622,7 +688,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/java_util testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/java_util testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST_WITH_SERVICES); \ + $(GEN_SUMMARY_GENERIC) tests=api/java_util testsuite=RUNTIME; \ $(TEST_STATUS) extended @@ -643,7 +711,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/javax_accessibility testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/javax_accessibility testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/javax_accessibility testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -657,7 +727,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/javax_activation testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/javax_activation testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/javax_activation testsuite=RUNTIME; \ $(TEST_STATUS) extended @@ -674,7 +746,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/javax_activity testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/javax_activity testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/javax_activity testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -691,7 +765,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/javax_annotation testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/javax_annotation testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/javax_annotation testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -713,7 +789,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/javax_crypto testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/javax_crypto testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/javax_crypto testsuite=RUNTIME; \ $(TEST_STATUS) extended @@ -727,7 +805,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/javax_imageio testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/javax_imageio testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/javax_imageio testsuite=RUNTIME; \ $(TEST_STATUS) extended @@ -741,7 +821,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/javax_lang testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/javax_lang testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/javax_lang testsuite=RUNTIME; \ $(TEST_STATUS) extended @@ -763,7 +845,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/javax_management testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/javax_management testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST_WITH_SERVICES); \ + $(GEN_SUMMARY_GENERIC) tests=api/javax_management testsuite=RUNTIME; \ $(TEST_STATUS) extended @@ -777,7 +861,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/javax_naming testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/javax_naming testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/javax_naming testsuite=RUNTIME; \ $(TEST_STATUS) extended @@ -805,7 +891,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/javax_net testsuite=RUNTIME concurrency=1; \ + $(GEN_JTB_GENERIC) tests=api/javax_net testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/javax_naming testsuite=RUNTIME; \ $(TEST_STATUS) extended @@ -831,7 +919,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/javax_print testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/javax_print testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/javax_print testsuite=RUNTIME; \ $(TEST_STATUS) extended @@ -853,7 +943,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/javax_rmi testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/javax_rmi testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/javax_rmi testsuite=RUNTIME; \ $(TEST_STATUS) extended @@ -867,7 +959,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/javax_script testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/javax_script testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/javax_script testsuite=RUNTIME; \ $(TEST_STATUS) extended @@ -881,7 +975,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/javax_security testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/javax_security testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/javax_security testsuite=RUNTIME; \ $(TEST_STATUS) special @@ -903,7 +999,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/javax_sound testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/javax_sound testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/javax_sound testsuite=RUNTIME; \ $(TEST_STATUS) extended @@ -917,7 +1015,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/javax_sql testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/javax_sql testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/javax_sql testsuite=RUNTIME; \ $(TEST_STATUS) extended @@ -941,7 +1041,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/javax_swing testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/javax_swing testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/javax_swing testsuite=RUNTIME; \ $(TEST_STATUS) extended @@ -963,7 +1065,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/javax_tools testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/javax_tools testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/javax_tools testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -977,7 +1081,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/javax_transaction testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/javax_transaction testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/javax_transaction testsuite=RUNTIME; \ $(TEST_STATUS) extended @@ -990,12 +1096,14 @@ 15+ - + jck-runtime-api-javax_xml NoOptions - $(JCK_CMD_TEMPLATE) tests=api/javax_xml testsuite=RUNTIME concurrency=1; \ + $(GEN_JTB_GENERIC) tests=api/javax_xml testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST_WITH_SERVICES); \ + $(GEN_SUMMARY_GENERIC) tests=api/javax_xml testsuite=RUNTIME; \ $(TEST_STATUS) extended @@ -1019,7 +1127,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/org_ietf testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/org_ietf testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/org_ietf testsuite=RUNTIME; \ $(TEST_STATUS) special @@ -1045,7 +1155,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/org_omg testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/org_omg testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/org_omg testsuite=RUNTIME; \ $(TEST_STATUS) extended @@ -1062,7 +1174,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/org_w3c testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/org_w3c testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/org_w3c testsuite=RUNTIME; \ $(TEST_STATUS) extended @@ -1076,7 +1190,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/org_xml testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/org_xml testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/org_xml testsuite=RUNTIME; \ $(TEST_STATUS) extended @@ -1090,7 +1206,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/xinclude testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/xinclude testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/xinclude testsuite=RUNTIME; \ $(TEST_STATUS) extended @@ -1104,7 +1222,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/xsl testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/xsl testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/xsl testsuite=RUNTIME; \ $(TEST_STATUS) extended @@ -1118,7 +1238,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=api/serializabletypes testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=api/serializabletypes testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=api/serializabletypes testsuite=RUNTIME; \ $(TEST_STATUS) sanity diff --git a/jck/runtime.lang/playlist.xml b/jck/runtime.lang/playlist.xml index bb752863d0..47923fd56e 100644 --- a/jck/runtime.lang/playlist.xml +++ b/jck/runtime.lang/playlist.xml @@ -19,7 +19,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=lang/BINC testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=lang/BINC testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=lang/BINC testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -33,7 +35,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=lang/CLSS testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=lang/CLSS testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=lang/CLSS testsuite=RUNTIME; \ $(TEST_STATUS) ^os.aix @@ -48,7 +52,9 @@ -Xss2M -Xmso1M - $(JCK_CMD_TEMPLATE) tests=lang/CLSS testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=lang/CLSS testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=lang/CLSS testsuite=RUNTIME; \ $(TEST_STATUS) os.aix @@ -67,7 +73,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=lang/CLSS testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=lang/CLSS testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=lang/CLSS testsuite=RUNTIME; \ $(TEST_STATUS) os.aix @@ -85,7 +93,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=lang/CONV testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=lang/CONV testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=lang/CONV testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -99,7 +109,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=lang/EXPR testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=lang/EXPR testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=lang/EXPR testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -113,7 +125,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=lang/INTF testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=lang/INTF testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=lang/INTF testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -127,7 +141,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=lang/LMBD testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=lang/LMBD testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=lang/LMBD testsuite=RUNTIME; \ $(TEST_STATUS) sanity diff --git a/jck/runtime.vm/playlist.xml b/jck/runtime.vm/playlist.xml index 7c49088fd3..3c55ac9ac3 100644 --- a/jck/runtime.vm/playlist.xml +++ b/jck/runtime.vm/playlist.xml @@ -27,7 +27,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=vm/constantpool testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=vm/constantpool testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=vm/constantpool testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -51,7 +53,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=vm/jdwp testsuite=RUNTIME concurrency=1; \ + $(GEN_JTB_GENERIC) tests=vm/jdwp testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=vm/jdwp testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -65,7 +69,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=vm/jvmti testsuite=RUNTIME concurrency=1; \ + $(GEN_JTB_GENERIC) tests=vm/jvmti testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=vm/jvmti testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -99,7 +105,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=vm/overview testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=vm/overview testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=vm/overview testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -113,7 +121,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=vm/classfmt testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=vm/classfmt testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=vm/classfmt testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -127,7 +137,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=vm/module testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=vm/module testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=vm/module testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -144,7 +156,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=vm/verifier/abstractAndNative testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=vm/verifier/abstractAndNative testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=vm/verifier/abstractAndNative testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -161,7 +175,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=$(VERIFIER_INSTRUCTIONS_TESTS_GROUP1) testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=$(VERIFIER_INSTRUCTIONS_TESTS_GROUP1) testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=$(VERIFIER_INSTRUCTIONS_TESTS_GROUP1) testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -178,7 +194,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=$(VERIFIER_INSTRUCTIONS_TESTS_GROUP2) testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=$(VERIFIER_INSTRUCTIONS_TESTS_GROUP2) testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=$(VERIFIER_INSTRUCTIONS_TESTS_GROUP2) testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -195,7 +213,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=$(VERIFIER_INSTRUCTIONS_TESTS_GROUP3) testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=$(VERIFIER_INSTRUCTIONS_TESTS_GROUP3) testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=$(VERIFIER_INSTRUCTIONS_TESTS_GROUP3) testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -212,7 +232,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=$(VERIFIER_INSTRUCTIONS_TESTS_GROUP4) testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=$(VERIFIER_INSTRUCTIONS_TESTS_GROUP4) testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=$(VERIFIER_INSTRUCTIONS_TESTS_GROUP4) testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -229,7 +251,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=vm/verifier/protectedCheck testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=vm/verifier/protectedCheck testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=vm/verifier/protectedCheck testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -246,7 +270,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=vm/verifier/subclassFinal testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=vm/verifier/subclassFinal testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=vm/verifier/subclassFinal testsuite=RUNTIME; \ $(TEST_STATUS) sanity @@ -263,7 +289,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=vm/instr testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=vm/instr testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=vm/instr testsuite=RUNTIME; \ $(TEST_STATUS) sanity diff --git a/jck/runtime.xml_schema/playlist.xml b/jck/runtime.xml_schema/playlist.xml index 1764b4d92e..9b06e4e7e1 100644 --- a/jck/runtime.xml_schema/playlist.xml +++ b/jck/runtime.xml_schema/playlist.xml @@ -19,7 +19,9 @@ NoOptions - $(JCK_CMD_TEMPLATE) tests=xml_schema/boeingData testsuite=RUNTIME; \ + $(GEN_JTB_GENERIC) tests=xml_schema/boeingData testsuite=RUNTIME; \ + $(EXEC_RUNTIME_TEST); \ + $(GEN_SUMMARY_GENERIC) tests=xml_schema/boeingData testsuite=RUNTIME; \ $(TEST_STATUS) sanity