Commit aa8d6d31 authored by Guus der Kinderen's avatar Guus der Kinderen

Making Travis happy

The Github-based CI server (Travis), tends to run out of resources quickly.
This commit adds a new optional flag that allows the build to skip tests that
are known to be resource intensive.
Example usage: ant -DskipResourceIntensiveTests=true clean test

This change also splits up build steps distinct Travis environments. This
helps to isolate resource usage, as well as speed things up (as things run
in parallel now)
parent b3d81843
......@@ -2,4 +2,11 @@ sudo: false
language: java
jdk:
- oraclejdk8
script: ant -Dhalt.on.plugin.error=true -f build/build.xml openfire test plugins
env:
- ENVTARGET=compile
- ENVTARGET=test
- ENVTARGET=openfire
- ENVTARGET=plugins
script: ant -Dhalt.on.plugin.error=true -f build/build.xml clean $ENVTARGET
......@@ -215,6 +215,7 @@
<patternset id="test.sources">
<include name="**/*Test.java"/>
<exclude name="**/CheckChainTrustedTest.java" if="skipResourceIntensiveTests"/>
</patternset>
<patternset id="web.sources">
......
......@@ -16,7 +16,6 @@ import java.util.List;
*
* @author Guus der Kinderen, guus.der.kinderen@gmail.com
*/
@Ignore // These tests make the continuous integration on GitHub (Travis) fail.
@RunWith( Parameterized.class )
public class CheckChainTrustedTest
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment