From 46ab6a1533b3d936925fe46687902150c7cbdab2 Mon Sep 17 00:00:00 2001
From: Simon Willnauer <simonw@apache.org>
Date: Mon, 25 Nov 2013 14:35:12 +0100
Subject: [PATCH] Include JVM Arg line in reproduce line

---
 pom.xml                                       | 11 +++++-
 .../junit/listeners/ReproduceInfoPrinter.java | 36 +++++++++++++++----
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1a6f59e7a10..e0b772d9474 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,11 +35,11 @@
         <tests.shuffle>true</tests.shuffle>
         <tests.output>onerror</tests.output>
         <tests.client.ratio></tests.client.ratio>
+        <tests.jvm.argline></tests.jvm.argline>
         <tests.jvm.option1>${env.ES_TESTS_JVM_OPTION1}</tests.jvm.option1>
         <tests.jvm.option2>${env.ES_TESTS_JVM_OPTION2}</tests.jvm.option2>
         <tests.jvm.option3>${env.ES_TESTS_JVM_OPTION3}</tests.jvm.option3>
         <tests.jvm.option4>${env.ES_TESTS_JVM_OPTION4}</tests.jvm.option4>
-
         <es.logger.level>INFO</es.logger.level>
     </properties>
 
@@ -370,6 +370,9 @@
                                 <exclude>**/Abstract*.class</exclude>
                                 <exclude>**/*StressTest.class</exclude>
                             </excludes>
+                            <argLine>
+                                ${tests.jvm.argline}
+                            </argLine>
                             <jvmArgs>
                                 <param>${tests.jvm.option1}</param>
                                 <param>${tests.jvm.option2}</param>
@@ -385,6 +388,12 @@
                             <haltOnFailure>${tests.failfast}</haltOnFailure>
                             <systemProperties>
                                 <!-- RandomizedTesting library system properties -->
+                                <tests.jvm.argline>${tests.jvm.argline}</tests.jvm.argline>
+                                <!-- the option[1..4] should go away soon once the jenkins skript if adjusted-->
+                                <tests.jvm.option1>${tests.jvm.option1}</tests.jvm.option1>
+                                <tests.jvm.option2>${tests.jvm.option2}</tests.jvm.option2>
+                                <tests.jvm.option3>${tests.jvm.option3}</tests.jvm.option3>
+                                <tests.jvm.option4>${tests.jvm.option4}</tests.jvm.option4>
                                 <tests.iters>${tests.iters}</tests.iters>
                                 <tests.maxfailures>${tests.maxfailures}</tests.maxfailures>
                                 <tests.failfast>${tests.failfast}</tests.failfast>
diff --git a/src/test/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java b/src/test/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java
index ed4a7ed6831..2bd8151204c 100644
--- a/src/test/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java
+++ b/src/test/java/org/elasticsearch/test/junit/listeners/ReproduceInfoPrinter.java
@@ -14,6 +14,8 @@ import org.junit.runner.notification.Failure;
 import org.junit.runner.notification.RunListener;
 
 import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 
 /**
  * A {@link RunListener} that emits to {@link System#err} a string with command
@@ -72,6 +74,7 @@ public class ReproduceInfoPrinter extends RunListener {
         @Override
         public ReproduceErrorMessageBuilder appendAllOpts(Description description) {
             super.appendAllOpts(description);
+            appendJVMArgLine();
             return appendESProperties();
         }
 
@@ -87,15 +90,36 @@ public class ReproduceInfoPrinter extends RunListener {
             } 
             return this;
         }
-        
+
         public ReproduceErrorMessageBuilder appendESProperties() {
             for (String sysPropName : Arrays.asList(
-                "es.logger.level", "es.node.mode", "es.node.local")) {
-              if (System.getProperty(sysPropName) != null && !System.getProperty(sysPropName).isEmpty()) {
-                appendOpt(sysPropName, System.getProperty(sysPropName));
-              }
+                    "es.logger.level", "es.node.mode", "es.node.local")) {
+                if (System.getProperty(sysPropName) != null && !System.getProperty(sysPropName).isEmpty()) {
+                    appendOpt(sysPropName, System.getProperty(sysPropName));
+                }
             }
             return this;
-          }
+        }
+
+        public ReproduceErrorMessageBuilder appendJVMArgLine() {
+            StringBuilder builder = new StringBuilder();
+            Set<String> values = new HashSet<String>();
+            for (String sysPropName : Arrays.asList(
+                    "tests.jvm.option1", "tests.jvm.option2", "tests.jvm.option3", "tests.jvm.option4", "tests.jvm.argline")) {
+                if (System.getProperty(sysPropName) != null && !System.getProperty(sysPropName).isEmpty()) {
+                    String propValue = System.getProperty(sysPropName).trim();
+                    if (!values.contains(propValue)) {
+                        builder.append(propValue);
+                        values.add(propValue); // deduplicate
+                        builder.append(' ');
+                    }
+                }
+            }
+            if (builder.length() > 0) {
+                appendOpt("tests.jvm.argline", "\"" + builder.toString().trim() + "\"");
+            }
+
+            return this;
+        }
     }
 }