[jboss-cvs] jrunit/src/main/org/jboss/jrunit/harness ...

[Ron Sigal]

  User: rsigal  
  Date: 08/04/30 23:04:57

  Modified:    src/main/org/jboss/jrunit/harness    ServerTestHarness.java
                        BenchmarkTestDriver.java TestDriver.java
  Log:
  JBREM-238: Added use of jrunit.logdir system property.
  
  Revision  Changes    Path
  1.13      +3 -2      jrunit/src/main/org/jboss/jrunit/harness/ServerTestHarness.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServerTestHarness.java
  ===================================================================
  RCS file: /cvsroot/jboss/jrunit/src/main/org/jboss/jrunit/harness/ServerTestHarness.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- ServerTestHarness.java	13 Jan 2007 02:40:01 -0000	1.12
  +++ ServerTestHarness.java	1 May 2008 03:04:57 -0000	1.13
  @@ -520,9 +520,10 @@
   
            try
            {
  -            File logFile = new File("test_logs");
  +            String logDirectory = System.getProperty("jrunit.logdir", ".");
  +            File logFile = new File(logDirectory + File.separator + "test_logs");
               logFile.mkdir();
  -            FileAppender fileAppender = new FileAppender(layout, "test_logs" + File.separator + testClass + "_" + num + "_output.log");
  +            FileAppender fileAppender = new FileAppender(layout, logFile.getPath() + File.separator + testClass + "_" + num + "_output.log");
               fileAppender.setAppend(false);
               //fileAppender.setThreshold(Level.toLevel(testLogLevel));
               Category.getRoot().addAppender(fileAppender);
  
  
  
  1.3       +2 -1      jrunit/src/main/org/jboss/jrunit/harness/BenchmarkTestDriver.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BenchmarkTestDriver.java
  ===================================================================
  RCS file: /cvsroot/jboss/jrunit/src/main/org/jboss/jrunit/harness/BenchmarkTestDriver.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- BenchmarkTestDriver.java	7 Sep 2005 03:58:49 -0000	1.2
  +++ BenchmarkTestDriver.java	1 May 2008 03:04:57 -0000	1.3
  @@ -64,7 +64,8 @@
   
         try
         {
  -         File reportFile = new File(className + "_benchmark.txt");
  +         String logDirectory = System.getProperty("jrunit.logdir", ".");
  +         File reportFile = new File(logDirectory + File.separator + className + "_benchmark.txt");
            if(!reportFile.exists())
            {
               reportFile.createNewFile();
  
  
  
  1.23      +7 -2      jrunit/src/main/org/jboss/jrunit/harness/TestDriver.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TestDriver.java
  ===================================================================
  RCS file: /cvsroot/jboss/jrunit/src/main/org/jboss/jrunit/harness/TestDriver.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -b -r1.22 -r1.23
  --- TestDriver.java	7 Mar 2008 07:41:45 -0000	1.22
  +++ TestDriver.java	1 May 2008 03:04:57 -0000	1.23
  @@ -140,9 +140,10 @@
   
         try
         {
  -         File logFile = new File("test_logs");
  +         String logDirectory = System.getProperty("jrunit.logdir", ".");
  +         File logFile = new File(logDirectory + File.separator + "test_logs");
            logFile.mkdir();
  -         FileAppender fileAppender = new FileAppender(layout, "test_logs" + File.separator + "TestDriver_output.log");
  +         FileAppender fileAppender = new FileAppender(layout, logFile.getPath() + File.separator + "TestDriver_output.log");
            fileAppender.setAppend(false);
            //fileAppender.setThreshold(Level.DEBUG);
            Category.getRoot().addAppender(fileAppender);
  @@ -718,6 +719,10 @@
         if (property != null)
            path += " -Djrunit.send_interfaces="  + property + " ";
         
  +      property = System.getProperty("jrunit.logdir");
  +      if (property != null)
  +         path += " -Djrunit.logdir="  + property + " ";
  +      
         if(vmArgs != null && vmArgs.length() > 0)
         {
            path += " " + vmArgs + " ";