Merge branch '2015.11-develop' into 2016.03

[tine20] / tine20 / build.xml

diff --git a/tine20/build.xml b/tine20/build.xml
index 79644ee..e2d9128 100644 (file)
--- a/tine20/build.xml
+++ b/tine20/build.xml
@@ -139,7 +139,7 @@
     <!-- ============================================      -->
     <target name="phpunit-exec" depends="clean, phpunit-prepare">
         <property name="testinclude" value="AllTests.php" override="true" />
-        <property name="includepath" value=".:/usr/share/php/:${configdir}:${project.basedir}:${project.basedir}/library:${project.basedir}/library/zf1ext" override="true" />
+        <property name="includepath" value=".:/usr/share/php/:${configdir}:${project.basedir}:${project.basedir}/library:${project.basedir}/vendor/zendframework/zendframework1/library" override="true" />
         <property name="testadditionalparams" value="" override="true" />
         <property name="testsuite" value="tine20" override="true" />
         
@@ -166,7 +166,7 @@
     <!-- ============================================      -->
     <target name="phpunit-serv" depends="clean, phpunit-prepare">
         <property name="testinclude" value="AllServerTests.php" override="true" />
-        <property name="includepath" value=".:/usr/share/php/:${configdir}:${project.basedir}:${project.basedir}/library/:${project.basedir}/library/zf1ext" override="true" />
+        <property name="includepath" value=".:/usr/share/php/:${configdir}:${project.basedir}:${project.basedir}/library/:${project.basedir}/vendor/zendframework/zendframework1/library" override="true" />
         <property name="testadditionalparams" value="" override="true" />
 
         <echo msg="Starting Server Tests..." />