aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2013-05-10 12:37:34 +0300
committerVaadin Code Review <review@vaadin.com>2013-05-10 10:09:54 +0000
commit62ae5e19a18e8820aa070b18e001bc53edca1a5f (patch)
treeaab4e3622613b7401cdaa469d4f49dd5fb10b1f4
parentffd1c1bff51433440a5ea4f41fd042790b6b897a (diff)
downloadvaadin-framework-62ae5e19a18e8820aa070b18e001bc53edca1a5f.tar.gz
vaadin-framework-62ae5e19a18e8820aa070b18e001bc53edca1a5f.zip
More verbose output from running Jetty
This is an attempt to find what it is that sometimes seems to cause Jetty to terminate before all the tests have run. Change-Id: Id33e42c49d7528034b2859294e52111df218763a
-rw-r--r--uitest/test.xml1
-rw-r--r--uitest/vaadin-server.xml3
2 files changed, 3 insertions, 1 deletions
diff --git a/uitest/test.xml b/uitest/test.xml
index ee4927fc7b..f3cf2f0884 100644
--- a/uitest/test.xml
+++ b/uitest/test.xml
@@ -182,6 +182,7 @@
<sequential>
<ant antfile="${test.xml.dir}/vaadin-server.xml" target="wait-for-startup" />
<antcall inheritall="true" inheritrefs="true" target="run-and-clean-up" />
+ <echo message="All TestBench tests have been run" />
</sequential>
</parallel>
</target>
diff --git a/uitest/vaadin-server.xml b/uitest/vaadin-server.xml
index e02fab8564..5741d78525 100644
--- a/uitest/vaadin-server.xml
+++ b/uitest/vaadin-server.xml
@@ -8,7 +8,7 @@
<ivy:resolve file="${dir}/ivy.xml" />
<ivy:cachepath pathid="classpath.jetty" conf="jetty-run" />
- <java classname="org.mortbay.jetty.runner.Runner" fork="yes">
+ <java classname="org.mortbay.jetty.runner.Runner" fork="yes" output="${vaadin.basedir}/result/jetty.java.out" resultproperty="resultCode">
<arg value="--port" />
<arg value="8888" />
<arg value="--out" />
@@ -19,6 +19,7 @@
<classpath refid="classpath.jetty" />
<jvmarg value="-ea" />
</java>
+ <echo message="Jetty process ended with result code ${resultCode}" />
</target>