< prev index next >

tools/FxTestRunner/src/client/test/runner/DistributedTestScript.java

Print this page
rev 319 : 8160349: [TEST BUG] Hanged test blocks port and breaks following tests
Summary: Now each test uses random free port and test runner correctly handles interrupts from javatest.


  63     @Override
  64     protected void doRunTd(String[] command) throws IOException {
  65         final String[] cmd = CtrUtils.deleteEmptyElements(command);
  66         new Thread(new Runnable() {
  67             @Override
  68             public void run() {
  69                 invokeAgentCommand(cmd);
  70             }
  71         }).start();
  72     }
  73 
  74     /**
  75      *
  76      * @param td
  77      * @param resultDir
  78      * @return
  79      * @throws IOException
  80      * @throws Fault
  81      */
  82     @Override
  83     protected String[] tdCmdArgs(TestDescription td, String resultDir) throws IOException, Fault {

  84         String id = env.lookup(BasicFXInterview.TESTSUITE_ID)[0];
  85         String host = env.lookup(BasicFXInterview.JAVATEST_HOSTNAME)[0];
  86         String verbose = Boolean.getBoolean("javatest.FXProcessCommand.verbose") ? "-v" : "";
  87 //        String[] args = super.tdCmdArgs(td, id + File.separator + td.getRootRelativePath());
  88         String[] args = super.tdCmdArgs(td, workdirPath + File.separator + td.getParameter("testName"));

  89         
  90         String[] ret = {
  91             "-mapArgs",
  92             "-c",
  93             "-classpath",
  94             System.getProperty("java.class.path"),
  95             PROCESS_COMMAND,
  96             id,
  97 //            "-execDir", id,
  98             verbose
  99         };
 100         return TestScript.addToArray(ret, TestScript.addToArray(args, host));
 101     }
 102 
 103     @Override
 104     protected synchronized void interrupt(Status status) {
 105         if(section != null && section.isMutable()){
 106             section.setStatus(status);
 107         }
 108         super.interrupt(status);




  63     @Override
  64     protected void doRunTd(String[] command) throws IOException {
  65         final String[] cmd = CtrUtils.deleteEmptyElements(command);
  66         new Thread(new Runnable() {
  67             @Override
  68             public void run() {
  69                 invokeAgentCommand(cmd);
  70             }
  71         }).start();
  72     }
  73 
  74     /**
  75      *
  76      * @param td
  77      * @param resultDir
  78      * @return
  79      * @throws IOException
  80      * @throws Fault
  81      */
  82     @Override
  83     protected String[] tdCmdArgs(TestDescription td, String resultDir, int port) throws IOException, Fault {

  84         String id = env.lookup(BasicFXInterview.TESTSUITE_ID)[0];
  85         String host = env.lookup(BasicFXInterview.JAVATEST_HOSTNAME)[0];
  86         String verbose = Boolean.getBoolean("javatest.FXProcessCommand.verbose") ? "-v" : "";
  87 //        String[] args = super.tdCmdArgs(td, id + File.separator + td.getRootRelativePath());
  88         String[] args = super.tdCmdArgs(td, workdirPath + File.separator + td.getParameter("testName"), port);

  89         
  90         String[] ret = {
  91             "-mapArgs",
  92             "-c",
  93             "-classpath",
  94             System.getProperty("java.class.path"),
  95             PROCESS_COMMAND,
  96             id,
  97 //            "-execDir", id,
  98             verbose
  99         };
 100         return TestScript.addToArray(ret, TestScript.addToArray(args, host));
 101     }
 102 
 103     @Override
 104     protected synchronized void interrupt(Status status) {
 105         if(section != null && section.isMutable()){
 106             section.setStatus(status);
 107         }
 108         super.interrupt(status);


< prev index next >