Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

adds a tck acceptance target that runs a test suite against a jar

  • Loading branch information...
commit a9bc36272963d3eb108aa7fa24254eaa68830bdb 1 parent 2e4fad1
Richard Warburton authored
Showing with 31 additions and 8 deletions.
  1. +1 −0  README.txt
  2. +30 −8 build.xml
View
1  README.txt
@@ -19,6 +19,7 @@ From the command line the following options will get you started:
ant examples # runs a supplied java program to print some examples
ant javadoc # creates the javadoc
ant test # runs the main test suite (excluding OpenJDK classes)
+ ant tck # runs the tck acceptance test. NB: you must use the -Dtck.implementation parameter in order to specify the jar under test
ant coverage # calculates test coverage (excluding OpenJDK classes)
Oracle JDK 1.6 (or OpenJDK) is required to build the codebase.
View
38 build.xml
@@ -47,9 +47,8 @@
<pathelement location="${ojdk.main.classes}" />
<pathelement location="${lib.main}/${tzdb.outputjar}"/>
</path>
-
- <path id="test.path">
- <path refid="main.path" />
+
+ <path id="test.commonpath">
<pathelement location="${core.test.classes}" />
<pathelement location="${extra.test.classes}" />
<pathelement location="${oracle.test.classes}" />
@@ -60,6 +59,16 @@
</fileset>
</path>
+ <path id="test.path">
+ <path refid="main.path" />
+ <path refid="test.commonpath" />
+ </path>
+
+ <path id="tck.path">
+ <pathelement location="${tck.implementation}" />
+ <path refid="test.commonpath" />
+ </path>
+
<path id="coverage.path">
<path refid="main.path" />
<pathelement location="${core.test.classes}" />
@@ -176,8 +185,8 @@
</target>
<target name="test-core" depends="compile-core-tests,compile-tzdb">
- <taskdef resource="testngtasks" classpathref="test.path" />
- <testng classpathref="test.path" outputDir="${core.test.classes}" sourceDir="${core.test}" haltonfailure="true" verbose="2">
+ <taskdef resource="testngtasks" classpathref="abstract.test.path" />
+ <testng classpathref="abstract.test.path" outputDir="${core.test.classes}" sourceDir="${core.test}" haltonfailure="true" verbose="2">
<jvmarg value="-Xmx512M" />
<jvmarg value="-Duser.language=en" />
<jvmarg value="-Duser.country=UK" />
@@ -186,8 +195,8 @@
</target>
<target name="test-extra" depends="compile-extra-tests,compile-tzdb">
- <taskdef resource="testngtasks" classpathref="test.path" />
- <testng classpathref="test.path" outputDir="${extra.test.classes}" sourceDir="${extra.test}" haltonfailure="true" verbose="2">
+ <taskdef resource="testngtasks" classpathref="abstract.test.path" />
+ <testng classpathref="abstract.test.path" outputDir="${extra.test.classes}" sourceDir="${extra.test}" haltonfailure="true" verbose="2">
<jvmarg value="-Xmx512M" />
<jvmarg value="-Duser.language=en" />
<jvmarg value="-Duser.country=UK" />
@@ -195,7 +204,20 @@
</testng>
</target>
- <target name="test" depends="test-core,test-extra" description="run tests" />
+ <target name="test" description="run tests">
+ <antcall target="test-core">
+ <reference refid="test.path" torefid="abstract.test.path" />
+ </antcall>
+ <antcall target="test-extra">
+ <reference refid="test.path" torefid="abstract.test.path" />
+ </antcall>
+ </target>
+
+ <target name="tck" description="run tck acceptance criteria">
+ <antcall target="test-core">
+ <reference refid="tck.path" torefid="abstract.test.path" />
+ </antcall>
+ </target>
<!-- ==================================================================== -->
<target name="coverage" depends="compile-core-tests" description="test coverage">

0 comments on commit a9bc362

Please sign in to comment.
Something went wrong with that request. Please try again.