Skip to content

Commit

Permalink
Travis CI: run sbt tests first and move Tomcat to prevent Scala.js error
Browse files Browse the repository at this point in the history
  • Loading branch information
ebruchez committed Sep 30, 2016
1 parent c479647 commit 9a1082a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions build.xml
Expand Up @@ -895,7 +895,7 @@
<!-- Uncompress Tomcat -->
<if>
<not><available file="build/apache-tomcat-${tomcat-version}"/></not>
<then><unzip src="lib/test/apache-tomcat-${tomcat-version}.zip" dest="build"/></then>
<then><unzip src="test/lib/apache-tomcat-${tomcat-version}.zip" dest="build"/></then>
</if>

<!-- Put database driver in Tomcat's lib -->
Expand Down Expand Up @@ -938,6 +938,14 @@
</then>
</if>

<!-- Run sbt tests -->
<exec executable="sbt" failonerror="true">
<arg value="-Dorbeon.version=${release.number}"/>
<arg value="-Dorbeon.edition=${edition}"/>
<arg value="project root"/>
<arg value="test"/>
</exec>

<delete dir="build/temp/test"/>
<mkdir dir="build/temp/test"/>
<delete dir="${test.exist-db.dir}"/>
Expand Down Expand Up @@ -1021,14 +1029,6 @@
<formatter usefile="false" classname="org.orbeon.junit.LiveResultFormatter"/>
</junit>

<!-- Run sbt tests -->
<exec executable="sbt" failonerror="true">
<arg value="-Dorbeon.version=${release.number}"/>
<arg value="-Dorbeon.edition=${edition}"/>
<arg value="project root"/>
<arg value="test"/>
</exec>

<!-- Stop Tomcat -->
<if>
<not><isset property="skip.selenium"/></not>
Expand Down
File renamed without changes.

0 comments on commit 9a1082a

Please sign in to comment.