svn commit: r1735914 - in /jmeter/trunk: src/core/org/apache/jmeter/JMeter.java xdocs/usermanual/generating-dashboard.xml

[sebb]

Author: sebb
Date: Mon Mar 21 01:19:48 2016
New Revision: 1735914

URL: http://svn.apache.org/viewvc?rev=1735914&view=rev
Log:
 Report/Dashboard reuses the same output directory
 No need for -n option when running generator only (-g)
Bugzilla Id: 58986

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
    jmeter/trunk/xdocs/usermanual/generating-dashboard.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=1735914&r1=1735913&r2=1735914&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Mon Mar 21 01:19:48 2016
@@ -250,7 +250,7 @@ public class JMeter implements JMeterPlu
             new CLOptionDescriptor("reportonly",
                     CLOptionDescriptor.ARGUMENT_REQUIRED, 
REPORT_GENERATING_OPT,
                     "generate report dashboard only",
-                    new CLOptionDescriptor[]{ D_REMOTE_OPT, 
D_REMOTE_OPT_PARAM, D_LOGFILE_OPT }); // disallowed
+                    new CLOptionDescriptor[]{ D_NONGUI_OPT, D_REMOTE_OPT, 
D_REMOTE_OPT_PARAM, D_LOGFILE_OPT }); // disallowed
     private static final CLOptionDescriptor D_REPORT_AT_END_OPT =
             new CLOptionDescriptor("reportatendofloadtests",
                     CLOptionDescriptor.ARGUMENT_DISALLOWED, REPORT_AT_END_OPT,
@@ -468,10 +468,15 @@ public class JMeter implements JMeterPlu
                         testFile = LoadRecentProject.getRecentFile(0);// most 
recent
                     }
                 }
-                if (parser.getArgumentById(NONGUI_OPT) == null) {
+                CLOption testReportOpt = 
parser.getArgumentById(REPORT_GENERATING_OPT);
+                if (testReportOpt != null) { // generate report from existing 
file
+                    String reportFile = testReportOpt.getArgument();
+                    ReportGenerator generator = new 
ReportGenerator(reportFile, null);
+                    generator.generate();
+                } else if (parser.getArgumentById(NONGUI_OPT) == null) { // 
not non-GUI => GUI
                     startGui(testFile);
                     startOptionalServers();
-                } else {
+                } else { // NON-GUI must be true
                     CLOption reportOutputFolderOpt = parser
                             .getArgumentById(REPORT_OUTPUT_FOLDER_OPT);
                     if(reportOutputFolderOpt != null) {
@@ -484,33 +489,23 @@ public class JMeter implements JMeterPlu
                                 reportOutputFolderAsFile.getAbsolutePath());   
                     
                     }
                     
-                    CLOption testReportOpt = parser
-                            .getArgumentById(REPORT_GENERATING_OPT);
-
-                    if (testReportOpt != null) {
-                        String reportFile = testReportOpt.getArgument();
-                        ReportGenerator generator = new ReportGenerator(
-                                reportFile, null);
-                        generator.generate();
-                    } else {
-                        CLOption rem = 
parser.getArgumentById(REMOTE_OPT_PARAM);
-                        if (rem == null) {
-                            rem = parser.getArgumentById(REMOTE_OPT);
-                        }
-                        CLOption jtl = parser.getArgumentById(LOGFILE_OPT);
-                        String jtlFile = null;
-                        if (jtl != null) {
-                            jtlFile = processLAST(jtl.getArgument(), ".jtl"); 
// $NON-NLS-1$
-                        }
-                        CLOption reportAtEndOpt = 
parser.getArgumentById(REPORT_AT_END_OPT);
-                        if(reportAtEndOpt != null) {
-                            if(jtlFile == null) {
-                                throw new IllegalUserActionException("Option 
-"+REPORT_AT_END_OPT+" requires -"+LOGFILE_OPT + " option");
-                            }
+                    CLOption rem = parser.getArgumentById(REMOTE_OPT_PARAM);
+                    if (rem == null) {
+                        rem = parser.getArgumentById(REMOTE_OPT);
+                    }
+                    CLOption jtl = parser.getArgumentById(LOGFILE_OPT);
+                    String jtlFile = null;
+                    if (jtl != null) {
+                        jtlFile = processLAST(jtl.getArgument(), ".jtl"); // 
$NON-NLS-1$
+                    }
+                    CLOption reportAtEndOpt = 
parser.getArgumentById(REPORT_AT_END_OPT);
+                    if(reportAtEndOpt != null) {
+                        if(jtlFile == null) {
+                            throw new IllegalUserActionException("Option 
-"+REPORT_AT_END_OPT+" requires -"+LOGFILE_OPT + " option");
                         }
-                        startNonGui(testFile, jtlFile, rem, reportAtEndOpt != 
null);
-                        startOptionalServers();
                     }
+                    startNonGui(testFile, jtlFile, rem, reportAtEndOpt != 
null);
+                    startOptionalServers();
                 }
             }
         } catch (IllegalUserActionException e) {

Modified: jmeter/trunk/xdocs/usermanual/generating-dashboard.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/generating-dashboard.xml?rev=1735914&r1=1735913&r2=1735914&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/generating-dashboard.xml (original)
+++ jmeter/trunk/xdocs/usermanual/generating-dashboard.xml Mon Mar 21 01:19:48 
2016
@@ -458,14 +458,14 @@ jmeter.reportgenerator.exporter.html.fil
                 <subsection name="&sect-num;.3.1 Generation from an existing 
sample log file" anchor="report_only">
                     <p>
                         Use the following command:
-                        <source>jmeter -n -g &lt;log file&gt; -o &lt;Path to 
output folder&gt;</source>
+                        <source>jmeter -g &lt;log file&gt; -o &lt;Path to 
output folder&gt;</source>
                     </p>
                 </subsection>
 
                 <subsection name="&sect-num;.3.2 Generation after load test" 
anchor="report_after_load_test">
                     <p>
                         Use the following command:
-                        <source>jmeter -n -t &lt;test JMX file&gt; -e -l 
&lt;test log file&gt; -o &lt;Path to output folder&gt;</source>
+                        <source>jmeter -n -t &lt;test JMX file&gt; -l &lt;test 
log file&gt; -e -o &lt;Path to output folder&gt;</source>
                     </p>
                 </subsection>
             </subsection>