(Attempt to fix Travis problem with JUnit)
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/67691b4c Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/67691b4c Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/67691b4c Branch: refs/heads/2.3 Commit: 67691b4c62d51998f5eb86f77bdaa24a98c10725 Parents: c688e15 Author: ddekany <ddek...@apache.org> Authored: Sat Aug 5 13:11:23 2017 +0200 Committer: ddekany <ddek...@apache.org> Committed: Sat Aug 5 13:11:23 2017 +0200 ---------------------------------------------------------------------- .travis.yml | 6 +++++- build.xml | 14 +------------- 2 files changed, 6 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/67691b4c/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 5e1f7ca..3a560ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,9 @@ language: java -install: ant download-ivy download-ant-junit +before_install: +- sudo apt-get -qq update +# ant-optional is needed for ant junit +- sudo apt-get install ant-optional +install: ant download-ivy script: ant ci jdk: - oraclejdk8 \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/67691b4c/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 4f45785..88deeea 100644 --- a/build.xml +++ b/build.xml @@ -140,18 +140,6 @@ <get src="https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"; dest="${ivy.jar.file}" usetimestamp="true"/> </target> - - <!-- Since 2017-08-05 or so, ant-junit was gone from Ant on Travis, hence we need this there: --> - <antversion property="antVersionNumber"/> - <property name="ant-junit.install.version" value="${antVersionNumber}" /> - <property name="ant-junit.home" value="${user.home}/.ant" /> - <property name="ant-junit.jar.dir" value="${ant-junit.home}/lib" /> - <property name="ant-junit.jar.file" value="${ant-junit.jar.dir}/ant-junit.jar" /> - <target name="download-ant-junit"> - <mkdir dir="${ant-junit.jar.dir}"/> - <get src="https://repo1.maven.org/maven2/org/apache/ant/ant-junit/${ant-junit.install.version}/ant-junit-${ant-junit.install.version}.jar"; - dest="${ant-junit.jar.file}" usetimestamp="true"/> - </target> <!-- ================================================================= --> <!-- Compilation --> @@ -460,7 +448,7 @@ <target name="test" depends="compileTest" description="Run test cases"> <mkdir dir="build/junit-reports" /> <ivy:cachepath conf="run.test" pathid="ivy.dep.run.test" /> - <junit haltonfailure="on" fork="true" forkmode="once"> + <junit haltonfailure="off" logfailedtests="true" fork="true" forkmode="once"> <classpath> <pathelement path="build/test-classes" /> <pathelement path="build/classes" />
