svn commit: r1561911 - in /incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent: AgentArgs.java JavaAgentRunner.java

[ol...@apache.org]

Author: olamy
Date: Tue Jan 28 00:34:32 2014
New Revision: 1561911

URL: http://svn.apache.org/r1561911
Log:
possible to pass sys args from main surefire process

Modified:
    incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/AgentArgs.java
    incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/JavaAgentRunner.java

Modified: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/AgentArgs.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/AgentArgs.java?rev=1561911&r1=1561910&r2=1561911&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/AgentArgs.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/AgentArgs.java Tue Jan 28 00:34:32 2014
@@ -35,4 +35,10 @@ public @interface AgentArgs
     String minMem() default "";
 
     boolean noVerify() default false;
+
+    /**
+     *
+     * @return system properties to use in the forked agent format: props1=value|props2=value
+     */
+    String sysProps() default "";
 }

Modified: incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/JavaAgentRunner.java
URL: http://svn.apache.org/viewvc/incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/JavaAgentRunner.java?rev=1561911&r1=1561910&r2=1561911&view=diff
==============================================================================
--- incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/JavaAgentRunner.java (original)
+++ incubator/sirona/trunk/agent/javaagent/src/test/java/org/apache/sirona/javaagent/JavaAgentRunner.java Tue Jan 28 00:34:32 2014
@@ -16,6 +16,7 @@
  */
 package org.apache.sirona.javaagent;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.text.StrSubstitutor;
 import org.junit.internal.TextListener;
 import org.junit.runner.Description;
@@ -126,14 +127,14 @@ public class JavaAgentRunner extends Blo
 
         String maxMem = agentArgs == null ? "" : agentArgs.maxMem();
 
-        if ( maxMem.length() > 1 )
+        if ( maxMem.length() > 0 )
         {
             args.add( "-Xmx" + maxMem );
         }
 
         String minMem = agentArgs == null ? "" : agentArgs.minMem();
 
-        if ( minMem.length() > 1 )
+        if ( minMem.length() > 0 )
         {
             args.add( "-Xms" + minMem );
         }
@@ -151,6 +152,23 @@ public class JavaAgentRunner extends Blo
         {
             args.add( "-noverify" );
         }
+
+        String sysProps = agentArgs == null ? "" : agentArgs.sysProps();
+
+        if (sysProps.length() > 0){
+             String[] splittedProps = StringUtils.split( sysProps, "|" );
+            for (String props : splittedProps)
+            {
+                String[] prop = StringUtils.split( props, "=" );
+                String key = prop[0];
+                String value = "";
+                if (prop.length>1){
+                    value = prop[1];
+                }
+                args.add( "-D" + key + "=" + StrSubstitutor.replace(  value, System.getProperties() ) );
+            }
+        }
+
         args.add( "-cp" );
         args.add(removeAgentFromCp(System.getProperty("surefire.test.class.path", System.getProperty("java.class.path"))));
         args.add(JavaAgentRunner.class.getName());