You are viewing a plain text version of this content. The canonical link for it is here.
Posted to kato-commits@incubator.apache.org by sp...@apache.org on 2009/11/22 17:31:41 UTC
svn commit: r883107 - in /incubator/kato/trunk/org.apache.kato:
kato.tck.harness/src/main/java/org/apache/kato/tck/harness/scenario/ScenarioElement.java
kato.tck/pom.xml kato.tck/src/test/ant/tck.xml
Author: spoole
Date: Sun Nov 22 17:31:40 2009
New Revision: 883107
URL: http://svn.apache.org/viewvc?rev=883107&view=rev
Log:
enable first testcase execution in tck
Modified:
incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/scenario/ScenarioElement.java
incubator/kato/trunk/org.apache.kato/kato.tck/pom.xml
incubator/kato/trunk/org.apache.kato/kato.tck/src/test/ant/tck.xml
Modified: incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/scenario/ScenarioElement.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/scenario/ScenarioElement.java?rev=883107&r1=883106&r2=883107&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/scenario/ScenarioElement.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.harness/src/main/java/org/apache/kato/tck/harness/scenario/ScenarioElement.java Sun Nov 22 17:31:40 2009
@@ -24,7 +24,8 @@
private IScenerioSetupHandler handler=ScenarioAnchor.getHandler();
public ScenarioElement() {
-
- handler.execute(this);
+ if(handler!=null) {
+ handler.execute(this);
+ }
}
}
Modified: incubator/kato/trunk/org.apache.kato/kato.tck/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck/pom.xml?rev=883107&r1=883106&r2=883107&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck/pom.xml (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck/pom.xml Sun Nov 22 17:31:40 2009
@@ -82,6 +82,7 @@
<version>M1-incubating</version>
<type>so</type>
</dependency>
+
</dependencies>
</profile>
</profiles>
@@ -125,6 +126,12 @@
<version>M1-incubating</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ <version>1.6.5</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
@@ -153,6 +160,8 @@
<property name="path" refid="maven.test.classpath" />
<property name="cjvmti.agent.path" value="${settings.localRepository}/org/apache/kato/native/${cjvmti.artifact}/${cjvmti.version}/${cjvmti.artifact}-${cjvmti.version}.${cjvmti.type}"/>
<property name="vmapi.agent.path" value="${settings.localRepository}/org/apache/kato/native/${vmapi.artifact}/${vmapi.version}/${vmapi.artifact}-${vmapi.version}.${vmapi.type}"/>
+ <property name="target" value="${project.build.directory}"/>
+
</ant>
</tasks>
</configuration>
@@ -167,7 +176,21 @@
<artifactId>ant-trax</artifactId>
<version>1.6.5</version>
</dependency>
-
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-junit</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.kato</groupId>
+ <artifactId>kato.tck.testsuite</artifactId>
+ <version>M1-incubating</version>
+ </dependency>
</dependencies>
</plugin>
</plugins>
Modified: incubator/kato/trunk/org.apache.kato/kato.tck/src/test/ant/tck.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck/src/test/ant/tck.xml?rev=883107&r1=883106&r2=883107&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck/src/test/ant/tck.xml (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck/src/test/ant/tck.xml Sun Nov 22 17:31:40 2009
@@ -23,12 +23,7 @@
</taskdef>
<target name="test">
- <!-- determine the dump type available -->
- <!-- look for the cjvmti library -->
-
- <echo>${parent}</echo>
- <echo>${repo}</echo>
- <!-- determine the java level -->
+ <!-- create the scenario and cause a cjvmti dump -->
<tcksetup>
<classpath path="${path}" />
@@ -37,5 +32,14 @@
<jvmarg value="-Dorg.apache.kato.dumptrigger.librarypath=${vmapi.agent.path}"/>
</tcksetup>
+ <!-- run the tck testsuite -->
+
+ <junit >
+ <formatter type="plain"/>
+ <formatter type="xml"/>
+ <test name="org.apache.kato.tck.tests.javaruntime.AllJavaRuntimeTests" todir="${target}"/>
+ </junit>
+
+
</target>
</project>
\ No newline at end of file