Author: sebb
Date: Wed Dec 12 10:32:32 2007
New Revision: 603697
URL: http://svn.apache.org/viewvc?rev=603697&view=rev
Log:
Check that the remoteStart options -r and -R are only used with non_GUI -n
option
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
jakarta/jmeter/trunk/xdocs/changes.xml
jakarta/jmeter/trunk/xdocs/usermanual/get-started.xml
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=603697&r1=603696&r2=603697&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Wed Dec 12
10:32:32 2007
@@ -249,8 +249,17 @@
public void start(String[] args) {
CLArgsParser parser = new CLArgsParser(args, options);
- if (null != parser.getErrorString()) {
- System.err.println("Error: " + parser.getErrorString());
+ String error = parser.getErrorString();
+ if (error == null){// Check option combinations
+ boolean gui = parser.getArgumentById(NONGUI_OPT)==null;
+ boolean remoteStart =
parser.getArgumentById(REMOTE_OPT)!=null
+ ||
parser.getArgumentById(REMOTE_OPT_PARAM)!=null;
+ if (gui && remoteStart) {
+ error = "-r and -R are only valid in non-GUI mode";
+ }
+ }
+ if (null != error) {
+ System.err.println("Error: " + error);
System.out.println("Usage");
System.out.println(CLUtil.describeOptions(options).toString());
return;
@@ -644,11 +653,11 @@
}
}
if (testFile == null) {
- throw new IllegalUserActionException();
+ throw new IllegalUserActionException("Non-GUI runs
require a test plan");
}
String argument = testFile.getArgument();
if (argument == null) {
- throw new IllegalUserActionException();
+ throw new IllegalUserActionException("Non-GUI runs require a test
plan");
}
if (logFile == null) {
driver.run(argument, null, remoteStart !=
null,remote_hosts_string);
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=603697&r1=603696&r2=603697&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Wed Dec 12 10:32:32 2007
@@ -65,6 +65,7 @@
that contain '.functions.' and don't contain '.gui.'</li>
<li>Bug 43379 - Switch Controller now supports selection by name as well as
number</li>
<li>Can specify list of variable names to be written to JTL files (CSV and XML
format)</li>
+<li>Now checks that the remoteStart options -r and -R are only used with
non_GUI -n option</li>
</ul>
<h4>Non-functional changes</h4>
Modified: jakarta/jmeter/trunk/xdocs/usermanual/get-started.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/get-started.xml?rev=603697&r1=603696&r2=603697&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/usermanual/get-started.xml (original)
+++ jakarta/jmeter/trunk/xdocs/usermanual/get-started.xml Wed Dec 12 10:32:32
2007
@@ -269,7 +269,8 @@
where:
-G is used to define JMeter properties to be set in the servers
-X means exit the servers at the end of the test
--Rserver1,server2 - can be used instead of -r to provide a list of servers
(overrides remote_hosts)
+-Rserver1,server2 - can be used instead of -r to provide a list of servers to
start
+ Overrides remote_hosts, but does not define the property.
</pre>
</subsection>
@@ -369,9 +370,9 @@
-L, --loglevel {argument}={value}
Define loglevel: [category=]level
e.g. jorphan=INFO or jmeter.util=DEBUG
- -r, --runremote
+ -r, --runremote (non-GUI only)
Start remote servers (as defined by the jmeter property
remote_hosts)
- -R, --remotestart server1,...
+ -R, --remotestart server1,... (non-GUI only)
Start these remote servers (overrides remote_hosts)
-d, --homedir {argument}
the jmeter home directory to use
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
