When building via Maven, skip the tests that require resources to be prepared.
That broke a while ago and it's too much of a PITA to keep working. git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1138 ed5b42cb-e716-0410-a449-f6a68f950b19
This commit is contained in:
@@ -199,27 +199,6 @@
|
|||||||
</links>
|
</links>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-antrun-plugin</artifactId>
|
|
||||||
<version>1.6</version>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<phase>process-test-resources</phase>
|
|
||||||
<configuration>
|
|
||||||
<target>
|
|
||||||
<property name="deploy.dir" value="target" />
|
|
||||||
<ant antfile="${basedir}/build.xml">
|
|
||||||
<target name="-test-rsrcs" />
|
|
||||||
</ant>
|
|
||||||
</target>
|
|
||||||
</configuration>
|
|
||||||
<goals>
|
|
||||||
<goal>run</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-surefire-plugin</artifactId>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
@@ -228,6 +207,12 @@
|
|||||||
<includes>
|
<includes>
|
||||||
<include>com/threerings/**/*Test.java</include>
|
<include>com/threerings/**/*Test.java</include>
|
||||||
</includes>
|
</includes>
|
||||||
|
<!-- we have to skip these tests as they depend on resources being --
|
||||||
|
-- prepared which are too fiddly to get working via Maven -->
|
||||||
|
<excludes>
|
||||||
|
<exclude>com/threerings/**/BundledComponentRepositoryTest.java</exclude>
|
||||||
|
<exclude>com/threerings/**/BundledTileSetRepositoryTest.java</exclude>
|
||||||
|
</excludes>
|
||||||
<systemPropertyVariables>
|
<systemPropertyVariables>
|
||||||
<resource_dir>target/test-classes/rsrc</resource_dir>
|
<resource_dir>target/test-classes/rsrc</resource_dir>
|
||||||
<no_unpack_resources>true</no_unpack_resources>
|
<no_unpack_resources>true</no_unpack_resources>
|
||||||
|
|||||||
Reference in New Issue
Block a user