incubator-kato-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spo...@apache.org
Subject svn commit: r885102 - in /incubator/kato/trunk/org.apache.kato/kato.tck: execution/cjvmti/ execution/cjvmti/.settings/ execution/cjvmti/src/ execution/cjvmti/src/test/ execution/cjvmti/src/test/ant/ scenarios/142/
Date Sat, 28 Nov 2009 15:42:19 GMT
Author: spoole
Date: Sat Nov 28 15:42:19 2009
New Revision: 885102

URL: http://svn.apache.org/viewvc?rev=885102&view=rev
Log:
reinstated using ant to run junit tests for tck execution 

Added:
    incubator/kato/trunk/org.apache.kato/kato.tck/execution/cjvmti/.settings/
    incubator/kato/trunk/org.apache.kato/kato.tck/execution/cjvmti/src/
    incubator/kato/trunk/org.apache.kato/kato.tck/execution/cjvmti/src/test/
    incubator/kato/trunk/org.apache.kato/kato.tck/execution/cjvmti/src/test/ant/
    incubator/kato/trunk/org.apache.kato/kato.tck/execution/cjvmti/src/test/ant/test.xml
Modified:
    incubator/kato/trunk/org.apache.kato/kato.tck/execution/cjvmti/pom.xml
    incubator/kato/trunk/org.apache.kato/kato.tck/scenarios/142/pom.xml

Modified: incubator/kato/trunk/org.apache.kato/kato.tck/execution/cjvmti/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck/execution/cjvmti/pom.xml?rev=885102&r1=885101&r2=885102&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck/execution/cjvmti/pom.xml (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck/execution/cjvmti/pom.xml Sat Nov 28 15:42:19
2009
@@ -1,152 +1,150 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+	<!--
+		* Licensed to the Apache Software Foundation (ASF) under one * or more
+		contributor license agreements. See the NOTICE file * distributed with
+		this work for additional information * regarding copyright ownership.
+		The ASF licenses this file * to you under the Apache License, Version
+		2.0 (the * "License"); you may not use this file except in compliance
+		* with the License. You may obtain a copy of the License at * *
+		http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by
+		applicable law or agreed to in writing, * software distributed under
+		the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES
+		OR CONDITIONS OF ANY * KIND, either express or implied. See the
+		License for the * specific language governing permissions and
+		limitations * under the License.
+	-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<description>Execute  TCK against  CJVMTI Dump</description>
-  <parent>
-    <artifactId>kato.tck.execution</artifactId>
-    <groupId>org.apache.kato</groupId>
-    <version>M1-incubating</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.kato</groupId>
-  <artifactId>kato.tck.execution.cjvmti</artifactId>
-  <name>Execute  TCK against  CJVMTI Dump</name>
-  <version>M1-incubating</version>
-
-  <profiles>
-  
-  <profile>
-    <id>default</id>
-    <activation>
-      <activeByDefault>true</activeByDefault>
-    </activation>
-      <properties>
-        <cjvmti.groupid>missing</cjvmti.groupid>
-    	<cjvmti.artifact>missing</cjvmti.artifact>
-    	<cjvmti.version>missing</cjvmti.version>
-    	<cjvmti.type>missing</cjvmti.type>
-    	
-    	<vmapi.groupid>missing</vmapi.groupid>
-    	<vmapi.artifact>missing</vmapi.artifact>
-    	<vmapi.version>missing</vmapi.version>
-    	<vmapi.type>missing</vmapi.type>
-    </properties>
-  </profile>
-  
-    <profile>
-      <id>windows x86</id>
-      	<activation>
+	<parent>
+		<artifactId>kato.tck.execution</artifactId>
+		<groupId>org.apache.kato</groupId>
+		<version>M1-incubating</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.apache.kato</groupId>
+	<artifactId>kato.tck.execution.cjvmti</artifactId>
+	<name>Execute  TCK against  CJVMTI Dump</name>
+	<version>M1-incubating</version>
+
+	<profiles>
+
+		<profile>
+			<id>default</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<properties>
+				<cjvmti.groupid>missing</cjvmti.groupid>
+				<cjvmti.artifact>missing</cjvmti.artifact>
+				<cjvmti.version>missing</cjvmti.version>
+				<cjvmti.type>missing</cjvmti.type>
+
+				<vmapi.groupid>missing</vmapi.groupid>
+				<vmapi.artifact>missing</vmapi.artifact>
+				<vmapi.version>missing</vmapi.version>
+				<vmapi.type>missing</vmapi.type>
+			</properties>
+		</profile>
+
+		<profile>
+			<id>windows x86</id>
+			<activation>
 				<os>
 					<family>windows</family>
 					<arch>x86</arch>
 				</os>
 			</activation>
-      <properties>
-        <cjvmti.groupid>org.apache.kato.native</cjvmti.groupid>
-    	<cjvmti.artifact>cjvmti-windows-x86</cjvmti.artifact>
-    	<cjvmti.version>M1-incubating</cjvmti.version>
-    	<cjvmti.type>dll</cjvmti.type>
-    	
-    	<vmapi.groupid>org.apache.kato.native</vmapi.groupid>
-    	<vmapi.artifact>katovmapi-windows-x86</vmapi.artifact>
-    	<vmapi.version>M1-incubating</vmapi.version>
-    	<vmapi.type>dll</vmapi.type>
-    	 
-    </properties>
-    <dependencies>
-    	<dependency>
-    	 <artifactId>katovmapi-windows-x86</artifactId>
-    	 <groupId>org.apache.kato.native</groupId>
-    	 <version>M1-incubating</version>
-    	 <type>dll</type>
-    	 <scope>test</scope>
-    	</dependency>
-    </dependencies>
-    </profile>
+			<properties>
+				<cjvmti.groupid>org.apache.kato.native</cjvmti.groupid>
+				<cjvmti.artifact>cjvmti-windows-x86</cjvmti.artifact>
+				<cjvmti.version>M1-incubating</cjvmti.version>
+				<cjvmti.type>dll</cjvmti.type>
+
+				<vmapi.groupid>org.apache.kato.native</vmapi.groupid>
+				<vmapi.artifact>katovmapi-windows-x86</vmapi.artifact>
+				<vmapi.version>M1-incubating</vmapi.version>
+				<vmapi.type>dll</vmapi.type>
 
-    <profile>
-      <id>linux-x86</id>
+			</properties>
+			<dependencies>
+				<dependency>
+					<artifactId>katovmapi-windows-x86</artifactId>
+					<groupId>org.apache.kato.native</groupId>
+					<version>M1-incubating</version>
+					<type>dll</type>
+					<scope>test</scope>
+				</dependency>
+			</dependencies>
+		</profile>
+
+		<profile>
+			<id>linux-x86</id>
 			<activation>
 				<os>
 					<family>unix</family>
 					<arch>i386</arch>
 				</os>
 			</activation>
-    <properties>
-        <cjvmti.groupid>org.apache.kato.native</cjvmti.groupid>
-    	<cjvmti.artifact>libcjvmti-linux-x86</cjvmti.artifact>
-    	<cjvmti.version>M1-incubating</cjvmti.version>
-    	<cjvmti.type>so</cjvmti.type>
-    	<vmapi.groupid>org.apache.kato.native</vmapi.groupid>
-    	<vmapi.artifact>libkatovmapi-linux-x86</vmapi.artifact>
-    	<vmapi.version>M1-incubating</vmapi.version>
-    	<vmapi.type>so</vmapi.type>
-    </properties>
-     <dependencies>
-    	<dependency>
-    	 <artifactId>libkatovmapi-linux-x86</artifactId>
-    	 <groupId>org.apache.kato.native</groupId>
-    	 <version>M1-incubating</version>
-    	 <scope>test</scope>
-    	 <type>so</type>
-    	</dependency>
-    	
-    </dependencies>
-    </profile>
-  </profiles>
-    
-    
+			<properties>
+				<cjvmti.groupid>org.apache.kato.native</cjvmti.groupid>
+				<cjvmti.artifact>libcjvmti-linux-x86</cjvmti.artifact>
+				<cjvmti.version>M1-incubating</cjvmti.version>
+				<cjvmti.type>so</cjvmti.type>
+				<vmapi.groupid>org.apache.kato.native</vmapi.groupid>
+				<vmapi.artifact>libkatovmapi-linux-x86</vmapi.artifact>
+				<vmapi.version>M1-incubating</vmapi.version>
+				<vmapi.type>so</vmapi.type>
+			</properties>
+			<dependencies>
+				<dependency>
+					<artifactId>libkatovmapi-linux-x86</artifactId>
+					<groupId>org.apache.kato.native</groupId>
+					<version>M1-incubating</version>
+					<scope>test</scope>
+					<type>so</type>
+				</dependency>
+
+			</dependencies>
+		</profile>
+	</profiles>
+
+
 	<dependencies>
-					
-					
-					<dependency>
-						<groupId>org.apache.kato</groupId>
-						<artifactId>kato.tck.scenario.142</artifactId>
-						<version>M1-incubating</version>
-						<scope>test</scope>
-					</dependency>
-					<dependency>
-						<groupId>org.apache.kato</groupId>
-						<artifactId>kato.tck.scenario.150</artifactId>
-						<version>M1-incubating</version>
-						<scope>test</scope>
-					</dependency>
-					<dependency>
-						<groupId>org.apache.kato</groupId>
-						<artifactId>kato.tck.scenario.160</artifactId>
-						<version>M1-incubating</version>
-						<scope>test</scope>
-					</dependency>
-					<dependency>
-						<groupId>org.apache.kato</groupId>
-						<artifactId>kato.common.142</artifactId>
-						<version>M1-incubating</version>
-						<scope>test</scope>
-					</dependency>
-					<dependency>
-						<groupId>org.apache.kato</groupId>
-						<artifactId>kato.cjvmti</artifactId>
-						<version>M1-incubating</version>
-                        <scope>test</scope>
-					</dependency>
+
+
+		<dependency>
+			<groupId>org.apache.kato</groupId>
+			<artifactId>kato.tck.scenario.142</artifactId>
+			<version>M1-incubating</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.kato</groupId>
+			<artifactId>kato.tck.scenario.150</artifactId>
+			<version>M1-incubating</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.kato</groupId>
+			<artifactId>kato.tck.scenario.160</artifactId>
+			<version>M1-incubating</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.kato</groupId>
+			<artifactId>kato.common.142</artifactId>
+			<version>M1-incubating</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.kato</groupId>
+			<artifactId>kato.cjvmti</artifactId>
+			<version>M1-incubating</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
-	
+
 	<build>
 		<plugins>
 			<plugin>
@@ -167,27 +165,19 @@
 						<phase>generate-test-resources</phase>
 						<configuration>
 							<tasks>
-							
-							<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}"/>
-							
-							
-							<taskdef resource="org/apache/kato/anttasks/anttasks.properties">
-								<classpath path="${path}" />
-							</taskdef>
-							
-							<!-- create the scenario and cause a cjvmti dump -->
-		
-							<tcksetup dir="${target}">
-								<classpath path="${path}" />
-								<scenario name="142"/>
-								<jvmarg value="-agentpath:${cjvmti.agent.path}"/>
-								<jvmarg value="-Dorg.apache.kato.dumptrigger.librarypath=${vmapi.agent.path}"/>
-							</tcksetup>
-							
+
+
+								<ant antfile="test.xml" dir="src/test/ant">
+									<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>
 						<goals>
 							<goal>run</goal>
@@ -209,34 +199,32 @@
 						<groupId>org.apache.kato</groupId>
 						<artifactId>kato.anttasks</artifactId>
 						<version>M1-incubating</version>
-					
+
 					</dependency>
 					<dependency>
 						<groupId>org.apache.kato</groupId>
 						<artifactId>kato.tck.harness</artifactId>
 						<version>M1-incubating</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>
 				</dependencies>
 			</plugin>
-			
-			<plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-         <testFailureIgnore>true</testFailureIgnore>
-          <systemProperties>
-            <property>
-              <name>org.apache.kato.dumppath</name>
-              <value>${project.build.directory}/cjvmtiV0.cdmp</value>
-            </property>
-          </systemProperties>
-          
-        </configuration>
-      </plugin>
-			
+
+
+
 		</plugins>
 	</build>
-	  
+
 </project>
 	
\ No newline at end of file

Added: incubator/kato/trunk/org.apache.kato/kato.tck/execution/cjvmti/src/test/ant/test.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck/execution/cjvmti/src/test/ant/test.xml?rev=885102&view=auto
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck/execution/cjvmti/src/test/ant/test.xml (added)
+++ incubator/kato/trunk/org.apache.kato/kato.tck/execution/cjvmti/src/test/ant/test.xml Sat
Nov 28 15:42:19 2009
@@ -0,0 +1,46 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<project default="test">
+	
+	<taskdef resource="org/apache/kato/anttasks/anttasks.properties">
+			<classpath path="${path}" />
+		</taskdef>
+	<target name="test">
+		
+		<!-- create the scenario and cause a cjvmti dump -->
+		
+		<tcksetup dir="${target}">
+			<classpath path="${path}" />
+			<scenario name="142"/>
+			<jvmarg value="-agentpath:${cjvmti.agent.path}"/>
+			<jvmarg value="-Dorg.apache.kato.dumptrigger.librarypath=${vmapi.agent.path}"/>
+		</tcksetup>
+		
+		<!-- run the tck testsuite -->
+		
+		<junit>
+			<sysproperty key="org.apache.kato.dumppath" value="${target}/cjvmtiV0.cdmp"/>
+			<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

Modified: incubator/kato/trunk/org.apache.kato/kato.tck/scenarios/142/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck/scenarios/142/pom.xml?rev=885102&r1=885101&r2=885102&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck/scenarios/142/pom.xml (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck/scenarios/142/pom.xml Sat Nov 28 15:42:19
2009
@@ -65,8 +65,23 @@
             			<groupId>ant</groupId>
             			<artifactId>ant-trax</artifactId>
             			<version>1.6.5</version>
-          			</dependency>    
-        			
+          			</dependency>   
+          			<!-- following junit deps are here so as
+          			a work around for the ant plugin first instantiation
+          			problem 
+          			-->
+          			 
+        			<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.anttasks</artifactId>



Mime
View raw message