From 92801ba8bd1374c36868ddb83d4c93d8317a6cc0 Mon Sep 17 00:00:00 2001
From: romanb <romanb@625475ce-881a-0410-a577-b389adb331d8>
Date: Sat, 19 Sep 2009 12:10:59 +0000
Subject: [PATCH] [2.0] Fixed some build issues. Added new build properties.
 Please install VersionControl_SVN pear package in order to use the test
 target of the build file.

---
 build.properties.dev              | 4 +++-
 build.xml                         | 5 +++--
 tests/Doctrine/Tests/TestInit.php | 5 +++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/build.properties.dev b/build.properties.dev
index b5a7326bb..e5c1a4902 100644
--- a/build.properties.dev
+++ b/build.properties.dev
@@ -3,4 +3,6 @@ version=2.0.0
 stability=alpha
 build.dir=build
 dist.dir=dist
-report.dir=reports
\ No newline at end of file
+report.dir=reports
+log.archive.dir=logs
+svn.path=/usr/bin/svn
\ No newline at end of file
diff --git a/build.xml b/build.xml
index a4c5ac9e4..6c3ae6d5e 100644
--- a/build.xml
+++ b/build.xml
@@ -121,7 +121,6 @@
         Runs the full test suite.
     -->
     <target name="test" depends="prepare">
-        <!-- 
         <phpunit printsummary="true" haltonfailure="true">
             <formatter todir="${build.dir}/logs" type="xml"/>
             <batchtest classpath="tests">
@@ -131,7 +130,9 @@
             </batchtest>
         </phpunit>
         <phpunitreport infile="${build.dir}/logs/testsuites.xml" format="frames" todir="${report.dir}/tests" />
-        -->
+        <tstamp/>
+        <svnlastrevision svnpath="${svn.path}" workingcopy="." propertyname="svn.lastrevision"/>
+        <copy file="${build.dir}/logs/testsuites.xml" tofile="${log.archive.dir}/${svn.lastrevision}/log.xml" overwrite="true"/>
     </target>
 
     <!-- 
diff --git a/tests/Doctrine/Tests/TestInit.php b/tests/Doctrine/Tests/TestInit.php
index 5ec03b1b9..1d363d1e0 100644
--- a/tests/Doctrine/Tests/TestInit.php
+++ b/tests/Doctrine/Tests/TestInit.php
@@ -14,7 +14,8 @@ $classLoader = new \Doctrine\Common\IsolatedClassLoader('Doctrine');
 $classLoader->register();
 
 set_include_path(
-    '.'
-    . PATH_SEPARATOR . __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'lib'
+    __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'lib'
+    . PATH_SEPARATOR .
+    get_include_path() 
 );