sebb 2003/10/14 14:37:13
Modified: src/core/org/apache/jmeter JMeter.java
Log:
Remove disabled items from test tree for non-GUI runs; added some more progress
messages
Revision Changes Path
1.19 +14 -1 jakarta-jmeter/src/core/org/apache/jmeter/JMeter.java
Index: JMeter.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/JMeter.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- JMeter.java 7 Oct 2003 18:29:55 -0000 1.18
+++ JMeter.java 14 Oct 2003 21:37:13 -0000 1.19
@@ -76,6 +76,7 @@
import org.apache.jmeter.engine.RemoteJMeterEngineImpl;
import org.apache.jmeter.engine.StandardJMeterEngine;
import org.apache.jmeter.engine.event.LoopIterationEvent;
+import org.apache.jmeter.engine.util.DisabledComponentRemover;
import org.apache.jmeter.exceptions.IllegalUserActionException;
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.gui.action.ActionRouter;
@@ -515,6 +516,13 @@
log.info("Loading file: " + f);
HashTree tree = SaveService.loadSubTree(reader);
+
+ // Remove the disabled items
+ // For GUI runs this is done in Start.java
+ DisabledComponentRemover remover =
+ new DisabledComponentRemover(tree);
+ tree.traverse(remover);
+
if (logFile != null)
{
ResultCollector logger = new ResultCollector();
@@ -541,14 +549,17 @@
while (st.hasMoreElements())
{
String el = (String) st.nextElement();
+ println("Configuring remote engine for "+el);
engines.add(doRemoteInit(el.trim(), tree));
}
+ println("Starting remote engines");
Iterator iter = engines.iterator();
while (iter.hasNext())
{
engine = (JMeterEngine) iter.next();
engine.runTest();
}
+ println("Remote engines have been started");
}
}
catch (Exception e)
@@ -617,6 +628,7 @@
*/
public void run()
{
+ println("Tidying up ...");
try
{
Thread.sleep(5000);
@@ -624,6 +636,7 @@
catch (InterruptedException e)
{
}
+ println("... end of run");
System.exit(0);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
