You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by rh...@apache.org on 2010/05/25 10:54:03 UTC

svn commit: r947968 - /subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd

Author: rhuijben
Date: Tue May 25 08:54:03 2010
New Revision: 947968

URL: http://svn.apache.org/viewvc?rev=947968&view=rev
Log:
* trunk/tools/buildbot/slaves/win32-SharpSvn
  Exit cleanup phase if dependency building fails. Remove
  http log on cleanup.

Modified:
    subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd

Modified: subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd?rev=947968&r1=947967&r2=947968&view=diff
==============================================================================
--- subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd (original)
+++ subversion/trunk/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd Tue May 25 08:54:03 2010
@@ -33,10 +33,11 @@ IF NOT EXIST "imports\" (
 IF NOT EXIST build\imports.done (
   copy /y imports\dev-default.build default.build
   nant build %NANTARGS%
-  del release\bin\*svn*
-  IF NOT ERRORLEVEL 1 (
-    echo. > build\imports.done
+  IF ERRORLEVEL 1 (
+    exit /B 1
   )
+  del release\bin\*svn* release\bin\_*.*
+  echo. > build\imports.done
 )
 
 POPD
@@ -51,5 +52,8 @@ taskkill /im svn.exe /f 2> nul:
 taskkill /im svnadmin.exe /f 2> nul:
 taskkill /im svnserve.exe /f 2> nul:
 taskkill /im httpd.exe /f 2> nul:
+IF EXIST "%TESTDIR%\tests\subversion\tests\cmdline\httpd\" (
+  rmdir /s /q  "%TESTDIR%\tests\subversion\tests\cmdline\httpd"
+)
 
 exit /B 0