summaryrefslogtreecommitdiffstats
path: root/uitest/vaadin-server.xml
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-09-05 19:45:04 +0300
committerArtur Signell <artur@vaadin.com>2012-09-09 11:23:30 +0300
commit98d9d6fafc612f44d62d025520d040c69f5e80bc (patch)
tree48950b9149db3b17686be0932ca5120e8a2868a2 /uitest/vaadin-server.xml
parentca9263e405d3988b20ddd1aa45eac4707674ddc0 (diff)
downloadvaadin-framework-98d9d6fafc612f44d62d025520d040c69f5e80bc.tar.gz
vaadin-framework-98d9d6fafc612f44d62d025520d040c69f5e80bc.zip
Fixed running of TestBench tests (#9299)
Diffstat (limited to 'uitest/vaadin-server.xml')
-rw-r--r--uitest/vaadin-server.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/uitest/vaadin-server.xml b/uitest/vaadin-server.xml
index f07ff49e50..3628483436 100644
--- a/uitest/vaadin-server.xml
+++ b/uitest/vaadin-server.xml
@@ -1,11 +1,12 @@
<?xml version="1.0"?>
<project xmlns:antcontrib="antlib:net.sf.antcontrib" xmlns:ivy="antlib:org.apache.ivy.ant" name="vaadin-server" default="deploy-and-start" basedir=".">
<include file="../common.xml" />
+ <dirname property="dir" file="${ant.file.vaadin-server}" />
<target name="deploy-and-start">
<fail unless="war.file" message="No war file given in 'war.file'" />
- <ivy:resolve file="ivy.xml" />
+ <ivy:resolve file="${dir}/ivy.xml" />
<ivy:cachepath pathid="classpath.jetty" conf="jetty-run" />
<java classname="org.mortbay.jetty.runner.Runner" fork="yes">
<arg value="--port" />