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/20 09:49:23 UTC
svn commit: r882471 - in /incubator/kato/trunk/org.apache.kato:
kato.anttasks/src/main/java/org/apache/kato/anttasks/tck/
kato.api.vm/src/main/java/javax/tools/diagnostics/vm/
kato.tck.testsuite.scenario.142/src/test/ant/
kato.tck.testsuite.scenario.15...
Author: spoole
Date: Fri Nov 20 09:49:22 2009
New Revision: 882471
URL: http://svn.apache.org/viewvc?rev=882471&view=rev
Log:
initial changes to tck setup so it allows specifing the dump trigger
Modified:
incubator/kato/trunk/org.apache.kato/kato.anttasks/src/main/java/org/apache/kato/anttasks/tck/TCKSetupTask.java
incubator/kato/trunk/org.apache.kato/kato.api.vm/src/main/java/javax/tools/diagnostics/vm/Dump.java
incubator/kato/trunk/org.apache.kato/kato.tck.testsuite.scenario.142/src/test/ant/test.xml
incubator/kato/trunk/org.apache.kato/kato.tck.testsuite.scenario.150/src/test/ant/test.xml
incubator/kato/trunk/org.apache.kato/kato.tck.testsuite.scenario.160/pom.xml
incubator/kato/trunk/org.apache.kato/kato.tck.testsuite.scenario.160/src/test/ant/test.xml
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.anttasks/src/main/java/org/apache/kato/anttasks/tck/TCKSetupTask.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.anttasks/src/main/java/org/apache/kato/anttasks/tck/TCKSetupTask.java?rev=882471&r1=882470&r2=882471&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.anttasks/src/main/java/org/apache/kato/anttasks/tck/TCKSetupTask.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.anttasks/src/main/java/org/apache/kato/anttasks/tck/TCKSetupTask.java Fri Nov 20 09:49:22 2009
@@ -41,6 +41,8 @@
private boolean validateOnly=false;
private static File home=new File(System.getProperty("user.home"));
+ private String triggerclass=null;
+
private File configdir=null;
private List envvars=new LinkedList();
@@ -72,6 +74,13 @@
return;
}
+ // add the dump trigger class if present
+ if(triggerclass!=null) {
+ Argument arg=createArg();
+ arg.setValue("-dumptrigger");
+ arg=createArg();
+ arg.setValue(triggerclass);
+ }
// config for what we want to execute
configureScenerios();
@@ -252,4 +261,8 @@
public void setConfigdir(File dir) {
configdir=dir;
}
+
+ public void setDumptrigger(String className) {
+ this.triggerclass=className;
+ }
}
Modified: incubator/kato/trunk/org.apache.kato/kato.api.vm/src/main/java/javax/tools/diagnostics/vm/Dump.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.api.vm/src/main/java/javax/tools/diagnostics/vm/Dump.java?rev=882471&r1=882470&r2=882471&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.api.vm/src/main/java/javax/tools/diagnostics/vm/Dump.java (original)
+++ incubator/kato/trunk/org.apache.kato/kato.api.vm/src/main/java/javax/tools/diagnostics/vm/Dump.java Fri Nov 20 09:49:22 2009
@@ -10,7 +10,7 @@
*/
public class Dump {
- public static final String initiatorPropertyName="javax.tools.diagnositics.vm.dumpinitiator";
+ private static final String initiatorPropertyName="javax.tools.diagnositics.vm.dumpinitiator";
/**
* <p>
Modified: incubator/kato/trunk/org.apache.kato/kato.tck.testsuite.scenario.142/src/test/ant/test.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck.testsuite.scenario.142/src/test/ant/test.xml?rev=882471&r1=882470&r2=882471&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite.scenario.142/src/test/ant/test.xml (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite.scenario.142/src/test/ant/test.xml Fri Nov 20 09:49:22 2009
@@ -4,7 +4,7 @@
<classpath path="${path}" />
</taskdef>
<target name="test">
- <tcksetup>
+ <tcksetup dumptrigger="org.apache.kato.tck.scenario142.DumpTrigger142">
<classpath path="${path}" />
<scenario name="142"/>
</tcksetup>
Modified: incubator/kato/trunk/org.apache.kato/kato.tck.testsuite.scenario.150/src/test/ant/test.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck.testsuite.scenario.150/src/test/ant/test.xml?rev=882471&r1=882470&r2=882471&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite.scenario.150/src/test/ant/test.xml (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite.scenario.150/src/test/ant/test.xml Fri Nov 20 09:49:22 2009
@@ -4,7 +4,7 @@
<classpath path="${path}" />
</taskdef>
<target name="test">
- <tcksetup>
+ <tcksetup dumptrigger="org.apache.kato.tck.scenario150.DumpTrigger150">
<classpath path="${path}" />
<scenario name="150"/>
</tcksetup>
Modified: incubator/kato/trunk/org.apache.kato/kato.tck.testsuite.scenario.160/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck.testsuite.scenario.160/pom.xml?rev=882471&r1=882470&r2=882471&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite.scenario.160/pom.xml (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite.scenario.160/pom.xml Fri Nov 20 09:49:22 2009
@@ -29,7 +29,7 @@
<artifactId>kato.tck.testsuite.scenario.160</artifactId>
<name>TCK testsuite scenario 1.6 </name>
<version>M1-incubating</version>
- <description>Scenario setup for TCK. Used to create an example system suitable for running on a 1.5 JVM</description>
+ <description>Scenario setup for TCK. Used to create an example system suitable for running on a 1.6 JVM</description>
<build>
<plugins>
<plugin>
Modified: incubator/kato/trunk/org.apache.kato/kato.tck.testsuite.scenario.160/src/test/ant/test.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.tck.testsuite.scenario.160/src/test/ant/test.xml?rev=882471&r1=882470&r2=882471&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck.testsuite.scenario.160/src/test/ant/test.xml (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck.testsuite.scenario.160/src/test/ant/test.xml Fri Nov 20 09:49:22 2009
@@ -4,7 +4,8 @@
<classpath path="${path}" />
</taskdef>
<target name="test">
- <tcksetup>
+ <echo>${path}</echo>
+ <tcksetup dumptrigger="org.apache.kato.tck.scenario160.DumpTrigger160">>
<classpath path="${path}" />
<scenario name="160"/>
</tcksetup>
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=882471&r1=882470&r2=882471&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.tck/pom.xml (original)
+++ incubator/kato/trunk/org.apache.kato/kato.tck/pom.xml Fri Nov 20 09:49:22 2009
@@ -29,6 +29,14 @@
<vmapi.type>so</vmapi.type>
</properties>
+ <dependencies>
+ <dependency>
+ <artifactId>libkatovmapi-linux-x86</artifactId>
+ <groupId>org.apache.kato.native</groupId>
+ <version>M1-incubating</version>
+ <type>so</type>
+ </dependency>
+ </dependencies>
</profile>
<profile>
@@ -49,6 +57,14 @@
<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>
+ <type>so</type>
+ </dependency>
+ </dependencies>
</profile>
</profiles>
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=882471&r1=882470&r2=882471&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 Fri Nov 20 09:49:22 2009
@@ -16,7 +16,7 @@
<classpath path="${path}" />
<scenario name="142"/>
<jvmarg value="-agentpath:${cjvmti.agent.path}"/>
- <jvmarg value="-Dorg.apache.kato.dumptrigger.librarypath=${cjvmti.agent.path}"/>
+ <jvmarg value="-Dorg.apache.kato.dumptrigger.librarypath=${vmapi.agent.path}"/>
</tcksetup>
</target>