@@ -357,13 +357,16 @@ public void execute(StfCoreExtension test) throws Exception {
357357 .addArg (" -passive" )
358358 );
359359
360- rmiRegistry = test .doRunBackgroundProcess ("Starting rmiregistry" , "RMI" , ECHO_ON , ExpectedOutcome .neverCompletes (), test .createJDKToolProcessDefinition ()
361- .setJDKToolOrUtility ("rmiregistry" ) );
362-
363- rmid = test .doRunBackgroundProcess ("Starting rmid" , "RMID" , ECHO_ON , ExpectedOutcome .neverCompletes (), test .createJDKToolProcessDefinition ()
364- .setJDKToolOrUtility ("rmid" )
365- .addArg ("-J-Dsun.rmi.activation.execPolicy=none " + "-J-Djava.security.policy=" + test .env ().findPrereqFile (testSuiteFolder + "/lib/jck.policy" ).toString ())
366- );
360+ // We only need RMI registry and RMI activation daemon processes for tests under api/java_rmi
361+ if (tests .contains ("api/java_rmi" )) {
362+ rmiRegistry = test .doRunBackgroundProcess ("Starting RMI registry" , "RMI" , ECHO_ON , ExpectedOutcome .neverCompletes (), test .createJDKToolProcessDefinition ()
363+ .setJDKToolOrUtility ("rmiregistry" ) );
364+
365+ rmid = test .doRunBackgroundProcess ("Starting RMI activation system daemon" , "RMID" , ECHO_ON , ExpectedOutcome .neverCompletes (), test .createJDKToolProcessDefinition ()
366+ .setJDKToolOrUtility ("rmid" )
367+ .addArg ("-J-Dsun.rmi.activation.execPolicy=none " + "-J-Djava.security.policy=" + test .env ().findPrereqFile (testSuiteFolder + "/lib/jck.policy" ).toString ())
368+ );
369+ }
367370
368371 // tnameserv has been removed from jdk11. We only should need it for jck8
369372 if (jckVersion .contains ("jck8" )) {
@@ -381,7 +384,7 @@ public void execute(StfCoreExtension test) throws Exception {
381384 // Use the presence of a '/' to signify that we are running a subset of tests.
382385 // If one of the highest level test nodes is being run it is likely to take a long time.
383386 if ( tests .contains ("/" ) && !isRiscv ) {
384- timeout = "6h " ;
387+ timeout = "8h " ;
385388 }
386389 outcome = ExpectedOutcome .cleanRun ().within (timeout );
387390
0 commit comments