Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 28 Apr 2016 14:17:00 +0000 (16:17 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 28 Apr 2016 14:17:00 +0000 (16:17 +0200)
1  2 
tine20/build.xml

      <!-- ============================================      -->
      <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" />
          
          <echo msg="Starting Tests..." />
          <echo msg="Using config file ${testconfigdir}/phpunit.xml" />