[jboss-cvs] JBoss Messaging SVN: r1805 - in trunk/tests: . bin etc etc/stress src/org/jboss/test/messaging/tools
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Dec 16 01:09:01 EST 2006
Author: ovidiu.feodorov at jboss.com
Date: 2006-12-16 01:08:50 -0500 (Sat, 16 Dec 2006)
New Revision: 1805
Modified:
trunk/tests/bin/runtest
trunk/tests/bin/start-rmi-server
trunk/tests/build.xml
trunk/tests/etc/log4j.info.xml
trunk/tests/etc/log4j.trace.xml
trunk/tests/etc/log4j.xml
trunk/tests/etc/stress/log4j.xml
trunk/tests/maven-tests.xml
trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
Log:
Refined log generation mechanism. Different type of tests generate log in differently
named files (messaging-invm.log, messaging-remote-client.log, messaging-remote-server.log
messaging-clustering-serverX.log, etc)
Modified: trunk/tests/bin/runtest
===================================================================
--- trunk/tests/bin/runtest 2006-12-16 04:27:46 UTC (rev 1804)
+++ trunk/tests/bin/runtest 2006-12-16 06:08:50 UTC (rev 1805)
@@ -78,6 +78,8 @@
SEP=":"
fi
+TEST_LOGFILE_SUFFIX=invm
+
while [ "$1" != "" ]; do
if [ "$1" = "-debug" ]; then
if [ $cygwin = false ]; then
@@ -99,6 +101,7 @@
if [ "$1" = "-remote" ]; then
isRemote=true;
REMOTE_TEST="-Dremote=true"
+ TEST_LOGFILE_SUFFIX=remote-client
shift
continue;
fi
@@ -114,6 +117,7 @@
fi
if [ "$1" = "-clustered" ]; then
TEST_CLUSTERED=true
+ TEST_LOGFILE_SUFFIX=clustering-client
shift
continue;
else
@@ -122,7 +126,15 @@
fi
done
-JAVA_OPTS="-Xmx1024M $JAVA_OPTS -Dmodule.output=$reldir/../output $REMOTE_TEST -Dtest.database=$TEST_DATABASE -Dtest.serialization=$TEST_SERIALIZATION -Dtest.clustered=$TEST_CLUSTERED -Dtest.remoting=$TEST_REMOTING -Dbuild.lib=../../output/lib"
+JAVA_OPTS="-Xmx1024M $JAVA_OPTS \
+-Dmodule.output=$reldir/../output \
+$REMOTE_TEST \
+-Dtest.database=$TEST_DATABASE \
+-Dtest.serialization=$TEST_SERIALIZATION \
+-Dtest.clustered=$TEST_CLUSTERED \
+-Dtest.remoting=$TEST_REMOTING \
+-Dtest.logfile.suffix=$TEST_LOGFILE_SUFFIX \
+-Dbuild.lib=../../output/lib"
if [ "$TARGET_TEST" != "" ]; then
TARGET_TEST="-t $TARGET_TEST"
Modified: trunk/tests/bin/start-rmi-server
===================================================================
--- trunk/tests/bin/start-rmi-server 2006-12-16 04:27:46 UTC (rev 1804)
+++ trunk/tests/bin/start-rmi-server 2006-12-16 06:08:50 UTC (rev 1805)
@@ -48,7 +48,7 @@
mkdir -p $reldir/../output/logs
-JAVA_OPTS="$JAVA_OPTS -Xmx768M -Dmodule.output=$reldir/../output -Dremote.test.suffix=-remote-$index"
+JAVA_OPTS="$JAVA_OPTS -Xmx768M -Dmodule.output=$reldir/../output"
if [ "$TEST_DATABASE" != "" ]; then
JAVA_OPTS="$JAVA_OPTS -Dtest.database=$TEST_DATABASE"
@@ -58,18 +58,19 @@
JAVA_OPTS="$JAVA_OPTS -Dtest.serialization=$TEST_SERIALIZATION"
fi
+if [ "$TEST_REMOTING" != "" ]; then
+ JAVA_OPTS="$JAVA_OPTS -Dtest.remoting=$TEST_REMOTING -Dtest.logfile.suffix=remote-server"
+fi
+
if [ "$TEST_CLUSTERED" != "" ]; then
- JAVA_OPTS="$JAVA_OPTS -Dtest.clustered=$TEST_CLUSTERED"
+ # last defined system property on command line take precedence
+ JAVA_OPTS="$JAVA_OPTS -Dtest.clustered=$TEST_CLUSTERED -Dtest.logfile.suffix=clustering-server$index"
fi
if [ "$index" != "" ]; then
JAVA_OPTS="$JAVA_OPTS -Dtest.server.index=$index"
fi
-if [ "$TEST_REMOTING" != "" ]; then
- JAVA_OPTS="$JAVA_OPTS -Dtest.remoting=$TEST_REMOTING"
-fi
-
if [ "$USE_EXISTENT_TEST_CLASSPATH_FILE" = "true" ]; then
CLASSPATH_FILE="$reldir/.test.execution.classpath"
else
Modified: trunk/tests/build.xml
===================================================================
--- trunk/tests/build.xml 2006-12-16 04:27:46 UTC (rev 1804)
+++ trunk/tests/build.xml 2006-12-16 06:08:50 UTC (rev 1805)
@@ -75,7 +75,14 @@
-->
<property name="test.remoting" value="socket"/>
+
<!--
+ By default, remote servers log file names should end in remote-server
+ -->
+ <property name="remote.server.test.logfile.suffix" value="remote-server"/>
+
+
+ <!--
Project paths.
-->
@@ -273,7 +280,7 @@
<java classname="org.jboss.test.messaging.tools.jmx.rmi.RMITestServer" fork="true" spawn="true">
<sysproperty key="module.output" value="${tests.output}"/>
- <sysproperty key="remote.test.suffix" value="-remote"/>
+ <sysproperty key="test.logfile.suffix" value="${remote.server.test.logfile.suffix}"/>
<sysproperty key="test.bind.address" value="${test.bind.address}"/>
<sysproperty key="test.database" value="${functional.tests.database}"/>
<sysproperty key="test.serialization" value="${functional.tests.serialization}"/>
@@ -291,7 +298,7 @@
<java classname="org.jboss.test.messaging.tools.jmx.rmi.RMITestServer" fork="true" spawn="true">
<sysproperty key="test.server.index" value="${test.server.index}"/>
<sysproperty key="module.output" value="${tests.output}"/>
- <sysproperty key="remote.test.suffix" value="-remote-${test.server.index}"/>
+ <sysproperty key="test.logfile.suffix" value="clustering-server${test.server.index}"/>
<sysproperty key="test.bind.address" value="${test.bind.address}"/>
<sysproperty key="test.database" value="${clustering.tests.database}"/>
<sysproperty key="test.serialization" value="${functional.tests.serialization}"/>
@@ -309,7 +316,7 @@
<java classname="org.jboss.test.messaging.tools.jmx.rmi.RMITestServer" fork="true" spawn="true">
<jvmarg value="-Xmx768M"/>
<sysproperty key="module.output" value="${tests.output}"/>
- <sysproperty key="remote.test.suffix" value="-remote"/>
+ <sysproperty key="test.logfile.suffix" value="remote-server-stress"/>
<sysproperty key="test.bind.address" value="${test.bind.address}"/>
<sysproperty key="test.database" value="${stress.tests.database}"/>
<sysproperty key="test.serialization" value="${stress.tests.serialization}"/>
@@ -344,6 +351,7 @@
<antcall target="remote-tests">
<param name="test.remoting" value="http"/>
</antcall>
+ <antcall target="clustering-tests"/>
</target>
<target name="stress-tests" depends="tests-jar, prepare-testdirs, clear-test-logs">
@@ -374,6 +382,7 @@
<sysproperty key="test.bind.address" value="${test.bind.address}"/>
<sysproperty key="test.database" value="${functional.tests.database}"/>
<sysproperty key="test.serialization" value="${functional.tests.serialization}"/>
+ <sysproperty key="test.logfile.suffix" value="invm"/>
<sysproperty key="build.lib" value="${build.lib}"/>
<jvmarg value="-Xmx512M"/>
<!--
@@ -493,6 +502,7 @@
<sysproperty key="test.bind.address" value="${test.bind.address}"/>
<sysproperty key="test.database" value="${stress.tests.database}"/>
<sysproperty key="test.serialization" value="${stress.tests.serialization}"/>
+ <sysproperty key="test.logfile.suffix" value="invm"/>
<jvmarg value="-Xmx512M"/>
<!--
<jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=antjunit"/>
@@ -539,6 +549,7 @@
<sysproperty key="test.database" value="${functional.tests.database}"/>
<sysproperty key="test.serialization" value="${functional.tests.serialization}"/>
<sysproperty key="test.remoting" value="${test.remoting}"/>
+ <sysproperty key="test.logfile.suffix" value="remote-client"/>
<jvmarg value="-Xmx512M"/>
<!--
<jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=antjunit"/>
@@ -610,6 +621,7 @@
<sysproperty key="test.database" value="${stress.tests.database}"/>
<sysproperty key="test.serialization" value="${stress.tests.serialization}"/>
<sysproperty key="test.remoting" value="${test.remoting}"/>
+ <sysproperty key="test.logfile.suffix" value="remote-client"/>
<jvmarg value="-Xmx512M"/>
<!-- <jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=unittest"/> -->
<classpath>
@@ -714,6 +726,7 @@
<sysproperty key="test.database" value="${clustering.tests.database}"/>
<sysproperty key="test.serialization" value="${functional.tests.serialization}"/>
<sysproperty key="test.clustered" value="true"/>
+ <sysproperty key="test.logfile.suffix" value="clustering-client"/>
<jvmarg value="-Xmx512M"/>
<!--
<jvmarg line="-Xmx512M -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=n,suspend=n,address=antjunit"/>
@@ -795,7 +808,9 @@
ClientCrashTest over "socket"
-->
- <antcall target="start-rmi-server"/>
+ <antcall target="start-rmi-server">
+ <param name="remote.server.test.logfile.suffix" value="remote-crash"/>
+ </antcall>
<antcall target="crash-test">
<param name="crash.test.name" value="org.jboss.test.messaging.jms.crash.ClientCrashTest"/>
@@ -807,6 +822,7 @@
<antcall target="start-rmi-server">
<param name="test.remoting" value="http"/>
+ <param name="remote.server.test.logfile.suffix" value="remote-crash"/>
</antcall>
<antcall target="crash-test">
@@ -818,8 +834,11 @@
ClientCrashTwoConnectionsTest over "socket"
-->
- <antcall target="start-rmi-server"/>
+ <antcall target="start-rmi-server">
+ <param name="remote.server.test.logfile.suffix" value="remote-crash"/>
+ </antcall>
+
<antcall target="crash-test">
<param name="crash.test.name" value="org.jboss.test.messaging.jms.crash.ClientCrashTwoConnectionsTest"/>
</antcall>
@@ -830,6 +849,7 @@
<antcall target="start-rmi-server">
<param name="test.remoting" value="http"/>
+ <param name="remote.server.test.logfile.suffix" value="remote-crash"/>
</antcall>
<antcall target="crash-test">
@@ -841,8 +861,11 @@
ClientCrashNegativeLeaseTest over "socket"
-->
- <antcall target="start-rmi-server"/>
+ <antcall target="start-rmi-server">
+ <param name="remote.server.test.logfile.suffix" value="remote-crash"/>
+ </antcall>
+
<antcall target="crash-test">
<param name="crash.test.name" value="org.jboss.test.messaging.jms.crash.ClientCrashNegativeLeaseTest"/>
</antcall>
@@ -853,6 +876,7 @@
<antcall target="start-rmi-server">
<param name="test.remoting" value="http"/>
+ <param name="remote.server.test.logfile.suffix" value="remote-crash"/>
</antcall>
<antcall target="crash-test">
@@ -864,8 +888,11 @@
ClientCrashZeroLeaseTest over "socket"
-->
- <antcall target="start-rmi-server"/>
+ <antcall target="start-rmi-server">
+ <param name="remote.server.test.logfile.suffix" value="remote-crash"/>
+ </antcall>
+
<antcall target="crash-test">
<param name="crash.test.name" value="org.jboss.test.messaging.jms.crash.ClientCrashZeroLeaseTest"/>
</antcall>
@@ -876,6 +903,7 @@
<antcall target="start-rmi-server">
<param name="test.remoting" value="http"/>
+ <param name="remote.server.test.logfile.suffix" value="remote-crash"/>
</antcall>
<antcall target="crash-test">
@@ -887,8 +915,11 @@
ClientCrashLargeLeaseTest over "socket"
-->
- <antcall target="start-rmi-server"/>
+ <antcall target="start-rmi-server">
+ <param name="remote.server.test.logfile.suffix" value="remote-crash"/>
+ </antcall>
+
<antcall target="crash-test">
<param name="crash.test.name" value="org.jboss.test.messaging.jms.crash.ClientCrashLargeLeaseTest"/>
</antcall>
@@ -899,6 +930,7 @@
<antcall target="start-rmi-server">
<param name="test.remoting" value="http"/>
+ <param name="remote.server.test.logfile.suffix" value="remote-crash"/>
</antcall>
<antcall target="crash-test">
@@ -910,8 +942,11 @@
CallbackFailureTest over "socket"
-->
- <antcall target="start-rmi-server"/>
+ <antcall target="start-rmi-server">
+ <param name="remote.server.test.logfile.suffix" value="remote-crash"/>
+ </antcall>
+
<antcall target="crash-test">
<param name="crash.test.name" value="org.jboss.test.messaging.jms.crash.CallbackFailureTest"/>
</antcall>
@@ -939,6 +974,7 @@
<sysproperty key="test.database" value="${functional.tests.database}"/>
<sysproperty key="test.serialization" value="${functional.tests.serialization}"/>
<sysproperty key="test.remoting" value="${test.remoting}"/>
+ <sysproperty key="test.logfile.suffix" value="crash"/>
<jvmarg value="-Xmx512M"/>
<!--
<jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=antjunit"/>
Modified: trunk/tests/etc/log4j.info.xml
===================================================================
--- trunk/tests/etc/log4j.info.xml 2006-12-16 04:27:46 UTC (rev 1804)
+++ trunk/tests/etc/log4j.info.xml 2006-12-16 06:08:50 UTC (rev 1805)
@@ -8,7 +8,13 @@
<appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
<errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="File" value="${module.output}/logs/messaging-tests${remote.test.suffix}.trace.log"/>
+ <!--
+ Normally "test.logfile.suffix" takes on of the values: "invm", "remote-client",
+ "remote-server", "clustering-client", "clustering-server<index>", "crash-client",
+ "crash-server", etc.
+ -->
+ <param name="File" value="${module.output}/logs/messaging-${test.logfile.suffix}.log"/>
+
<param name="DatePattern" value="'.'yyyy-MM-dd"/>
<param name="Threshold" value="INFO"/>
Modified: trunk/tests/etc/log4j.trace.xml
===================================================================
--- trunk/tests/etc/log4j.trace.xml 2006-12-16 04:27:46 UTC (rev 1804)
+++ trunk/tests/etc/log4j.trace.xml 2006-12-16 06:08:50 UTC (rev 1805)
@@ -8,7 +8,12 @@
<appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
<errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="File" value="${module.output}/logs/messaging-tests${remote.test.suffix}.trace.log"/>
+ <!--
+ Normally "test.logfile.suffix" takes on of the values: "invm", "remote-client",
+ "remote-server", "clustering-client", "clustering-server<index>", "crash-client",
+ "crash-server", etc.
+ -->
+ <param name="File" value="${module.output}/logs/messaging-${test.logfile.suffix}.log"/>
<param name="DatePattern" value="'.'yyyy-MM-dd"/>
<param name="Threshold" value="TRACE#org.jboss.logging.XLevel"/>
Modified: trunk/tests/etc/log4j.xml
===================================================================
--- trunk/tests/etc/log4j.xml 2006-12-16 04:27:46 UTC (rev 1804)
+++ trunk/tests/etc/log4j.xml 2006-12-16 06:08:50 UTC (rev 1805)
@@ -8,7 +8,12 @@
<appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
<errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="File" value="${module.output}/logs/messaging-tests${remote.test.suffix}.trace.log"/>
+ <!--
+ Normally "test.logfile.suffix" takes on of the values: "invm", "remote-client",
+ "remote-server", "clustering-client", "clustering-server<index>", "crash-client",
+ "crash-server", etc.
+ -->
+ <param name="File" value="${module.output}/logs/messaging-${test.logfile.suffix}.log"/>
<param name="DatePattern" value="'.'yyyy-MM-dd"/>
<param name="Threshold" value="TRACE#org.jboss.logging.XLevel"/>
Modified: trunk/tests/etc/stress/log4j.xml
===================================================================
--- trunk/tests/etc/stress/log4j.xml 2006-12-16 04:27:46 UTC (rev 1804)
+++ trunk/tests/etc/stress/log4j.xml 2006-12-16 06:08:50 UTC (rev 1805)
@@ -30,7 +30,7 @@
<appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
<errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
- <param name="File" value="${module.output}/logs/messaging-tests${remote.test.suffix}.stress.log"/>
+ <param name="File" value="${module.output}/logs/messaging-tests${test.logfile.suffix}.stress.log"/>
<!-- since majority of the tests are ran in fork mode by ant, the log file is overwritten
for each test. We need to append if we want to preserve a full testsuite run log.
Modified: trunk/tests/maven-tests.xml
===================================================================
--- trunk/tests/maven-tests.xml 2006-12-16 04:27:46 UTC (rev 1804)
+++ trunk/tests/maven-tests.xml 2006-12-16 06:08:50 UTC (rev 1805)
@@ -213,7 +213,7 @@
<java classname="org.jboss.test.messaging.tools.jmx.rmi.RMITestServer" fork="true" spawn="true">
<sysproperty key="module.output" value="${basedir}/target"/>
- <sysproperty key="remote.test.suffix" value="-remote"/>
+ <sysproperty key="test.logfile.suffix" value="-remote-maven"/>
<sysproperty key="test.bind.address" value="${test.bind.address}"/>
<sysproperty key="test.database" value="${functional.tests.database}"/>
<sysproperty key="test.serialization" value="${functional.tests.serialization}"/>
@@ -238,7 +238,7 @@
<java classname="org.jboss.test.messaging.tools.jmx.rmi.RMITestServer" fork="true" spawn="true">
<jvmarg value="-Xmx768M"/>
<sysproperty key="module.output" value="${tests.output}"/>
- <sysproperty key="remote.test.suffix" value="-remote"/>
+ <sysproperty key="test.logfile.suffix" value="-remote-maven"/>
<sysproperty key="test.bind.address" value="${test.bind.address}"/>
<sysproperty key="test.database" value="${stress.tests.database}"/>
<sysproperty key="test.serialization" value="${stress.tests.serialization}"/>
Modified: trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java 2006-12-16 04:27:46 UTC (rev 1804)
+++ trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java 2006-12-16 06:08:50 UTC (rev 1805)
@@ -141,7 +141,7 @@
}
else
{
- Server s = acquireRemote(1, i, true);
+ Server s = acquireRemote(2, i, true);
if (s != null)
{
@@ -307,10 +307,6 @@
sb.append("-Dmodule.output=").append(moduleOutput).append(' ');
- sb.append("-Dremote.test.suffix=-remote-").append(i).append(' ');
-
- sb.append("-Dtest.server.index=").append(i).append(' ');
-
sb.append("-Dtest.bind.address=localhost").append(' ');
String database = System.getProperty("test.database");
@@ -325,7 +321,13 @@
sb.append("-Dtest.serialization=").append(serialization).append(' ');
}
+ sb.append("-Dtest.server.index=").append(i).append(' ');
+
String clustered = System.getProperty("test.clustered");
+ if (clustered != null && clustered.trim().length() == 0)
+ {
+ clustered = null;
+ }
if (clustered != null)
{
sb.append("-Dtest.clustered=").append(clustered).append(' ');
@@ -337,6 +339,28 @@
sb.append("-Dtest.remoting=").append(remoting).append(' ');
}
+ String testLogfileSuffix = System.getProperty("test.logfile.suffix");
+
+ if (testLogfileSuffix == null)
+ {
+ testLogfileSuffix = "undefined-test-type";
+ }
+ else
+ {
+ int pos;
+ if ((pos = testLogfileSuffix.lastIndexOf("client")) != -1)
+ {
+ testLogfileSuffix = testLogfileSuffix.substring(0, pos) + "server";
+ }
+
+ if (clustered != null)
+ {
+ testLogfileSuffix += i;
+ }
+ }
+
+ sb.append("-Dtest.logfile.suffix=").append(testLogfileSuffix).append(' ');
+
String classPath = System.getProperty("java.class.path");
//System.out.println("CLASSPATH: " + classPath);
More information about the jboss-cvs-commits
mailing list