Menu
▾
▴
[Smartfrog-checkins] SF.net SVN: smartfrog:[7549] trunk/core/release
|
From: <st...@us...> - 2009-04-01 17:07:52
|
Revision: 7549
http://smartfrog.svn.sourceforge.net/smartfrog/?rev=7549&view=rev
Author: steve_l
Date: 2009-04-01 17:07:42 +0000 (Wed, 01 Apr 2009)
Log Message:
-----------
SFOS-1165 Package the tests so that they can be run against an RPM installation
Modified Paths:
--------------
trunk/core/release/build.xml
trunk/core/release/ivy.xml
Modified: trunk/core/release/build.xml
===================================================================
--- trunk/core/release/build.xml 2009-04-01 17:02:13 UTC (rev 7548)
+++ trunk/core/release/build.xml 2009-04-01 17:07:42 UTC (rev 7549)
@@ -1508,4 +1508,111 @@
</echo>
</target>
+
+ <!-- Junit testing against a remote installation -->
+
+ <target name="init-tests"
+ description="Run the functional tests against the remote RPM installation.
+ This does not install the RPMs; they must be already deployed"
+ depends="ready-to-compile-tests">
+ <echo level="verbose">
+ system.tests.enabled=${system.tests.enabled}
+ run.failing.tests=${run.failing.tests}
+ testcase=${testcase}
+ </echo>
+ <property name="services" value="org/smartfrog/services/"/>
+ <property name="unittests" value="org/smartfrog/test/unit/"/>
+ <property name="systemtests" value="org/smartfrog/test/system/"/>
+ <property name="processtests" value="org/smartfrog/test/process/"/>
+ <property name="componenttests" value="${systemtests}components/"/>
+ <patternset id="teststhatfail">
+ <!--SFOS-403-->
+ <!--<exclude name="${systemtests}/workflow/conditional/FailingConditionTest.*"
+ unless="run.failing.tests"/>-->
+ <!-- SFOS-154; test failing on VMWare and CruiseControl (sometimes). Possible race condition-->
+ <exclude name="${systemtests}/workflow/parallel/ParallelAsyncTest.*"
+ unless="run.failing.tests"/>
+ <!--SFOS-202 test case tcn1 is being skipped (failing) -->
+ <exclude name="${systemtests}/deploy/DeployTCN1Test.*"
+ unless="run.failing.tests"/>
+ <!-- SFOS-563 Constant tests are failing -->
+ <exclude name="${systemtests}/reference/constant/ConstantReferenceTest.*"
+ unless="run.failing.tests"/>
+
+ <!-- SFOS-890 Chmod "failing" tests are failing and marked as skipped -->
+ <exclude name="${systemtests}/filesystem/ChmodFailureTest.*"
+ unless="run.failing.tests"/>
+ <exclude name="${systemtests}/filesystem/ChmodTest.*"
+ unless="run.failing.tests"/>
+
+ <!-- SFOS-886 DetachingCompoundTest is failing and being skipped-->
+ <exclude name="${systemtests}/**/DetachingCompoundTest.*"
+ unless="run.failing.tests"/>
+
+
+ <!-- SFOS-761 TestCompound doesnt terminate correctly in all circumstances when the action terminates normally (as expected) -->
+ <exclude name="${systemtests}/workflow/thread/WorkflowThreadTest.*"
+ unless="run.failing.tests"/>
+
+
+ <!-- SFOS-565 cyclic reference test tcn19.sf is now spinning instead of detecting a cyclic reference
+ (this is a JRockit problem)
+ -->
+ <exclude name="${systemtests}/reference/CyclicReferenceTest.*"
+ unless="run.failing.tests"/>
+ </patternset>
+
+ </target>
+
+
+ <!-- refactoring of test run process-->
+ <target name="init-system-test-run" depends="init-tests,declare-system-test-tasks">
+ <pathconvert pathsep="${line.separator}| |-- "
+ property="echo.testharness.daemon.classpath"
+ refid="testharness.daemon.classpath">
+ </pathconvert>
+ <echo message=" --------------------------------------------------------"/>
+ <echo message=" Class Path= ${line.separator}| |-- ${echo.testharness.daemon.classpath}"/>
+ <echo message=" --------------------------------------------------------"/>
+
+ <presetdef name="junit-system-test-run">
+
+ <sf-junit
+ errorProperty="system.test.failed"
+ failureProperty="system.test.failed"
+ >
+ <sysproperty key="emma.coverage.out.file" file="${coverage.dir}/coverage.emma"/>
+ <sysproperty key="emma.coverage.out.merge" value="true"/>
+ <sysproperty key="emma.verbosity.level" value="verbose"/>
+ <!--
+ <syspropertyset>
+ <propertyref prefix="emma."/>
+ </syspropertyset>
+ -->
+ <syspropertyset>
+ <propertyref prefix="runtime"/>
+ </syspropertyset>
+ <syspropertyset>
+ <propertyref prefix="test."/>
+ </syspropertyset>
+ <classpath refid="testharness.daemon.classpath"/>
+ <!-- #Test case isolation technique -->
+ <test todir="${test.data.dir}" name="${testcase}" if="testcase"/>
+ <batchtest todir="${test.data.dir}" unless="testcase">
+ <!-- bulk test case -->
+ <fileset dir="${test.classes.dir}">
+ <!-- pull in everything -->
+ <include name="org/smartfrog/test/system/**/*Test.class"/>
+
+ <!-- failing tests excluded unless run.failing.tests is set -->
+ <patternset refid="teststhatfail"/>
+
+ <exclude name="${componenttests}utils/**/*Test.class"
+ unless="installer.present"/>
+
+ </fileset>
+ </batchtest>
+ </sf-junit>
+ </presetdef>
+ </target>
</project>
\ No newline at end of file
Modified: trunk/core/release/ivy.xml
===================================================================
--- trunk/core/release/ivy.xml 2009-04-01 17:02:13 UTC (rev 7548)
+++ trunk/core/release/ivy.xml 2009-04-01 17:07:42 UTC (rev 7549)
@@ -22,7 +22,7 @@
description="artifacts needed to compile the application"/>
<conf name="daemon" visibility="private"
description="the classpath needed to run smartfrog daemons"/>
- <conf name="test" extends="default"
+ <conf name="test" extends="default, package-all"
description="the classpath needed to run tests"/>
<conf name="master" description="contains the artifact but no dependencies"/>
<conf name="redist" description="redistributals excluding smartfrog artifacts"/>
@@ -30,6 +30,8 @@
extends="redist"/>
<!-- <conf name="izpack" visibility="private"
description="izpack libraries"/>-->
+ <conf name="package-all" description="all the packages in one big dependency"
+ extends="package-core,package-examples,package-ant,package-anubis,package-csvfiles,package-database,package-jmx,package-hadoop,package-logging,package-networking,package-quartz,package-rpmtools,package-scripting,package-testing,package-velocity,package-www,package-xml,package-xmpp"/>
<!-- From here on, every Package we bundle in Ivy contains its own configuration -->
<conf name="package-core-install"
description="The .zip file containing the complete base distribution of SmartFrog"/>
@@ -106,9 +108,20 @@
<dependency org="org.smartfrog"
name="sf-tasks" changing="true"
rev="${ivy.smartfrog.version}"
- conf="redist->redist;package-core->master"/>
+ conf="redist->redist;package-core->master;build->default"/>
+
+ <!-- the testharness. This is not redistributed, it is used to test the RPMs-->
+
<dependency org="org.smartfrog"
+ name="sf-testharness"
+ changing="true"
+ rev="latest.integration"
+ conf="test->default,testjar"/>
+
+ <!-- the ant build, which contains the zipped/tarred directory tree-->
+
+ <dependency org="org.smartfrog"
name="sf-antbuild" changing="true"
rev="${ivy.smartfrog.version}"
conf="package-antbuild-minimal->minimal;package-antbuild-full->full;package-antbuild-source->source"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|