[svk-commit] r2256 - branches/2.0-releng/t

[nobody at bestpractical.com]

Author: clkao
Date: Sun Dec 24 07:50:01 2006
New Revision: 2256

Modified:
   branches/2.0-releng/t/07smerge-copy-co.t
   branches/2.0-releng/t/11checkout.t

Log:
Fix test on win32.

Modified: branches/2.0-releng/t/07smerge-copy-co.t
==============================================================================
--- branches/2.0-releng/t/07smerge-copy-co.t	(original)
+++ branches/2.0-releng/t/07smerge-copy-co.t	Sun Dec 24 07:50:01 2006
@@ -26,7 +26,8 @@
 is_output ($svk, 'st', [],
 	   ['A + A-cp',
 	    ' M  .']);
-
+warn $output;
+exit;
 is_output ($svk, 'ci', [-m => 'commit the smerge from checkout'],
 	   ['Committed revision 6.']);
 

Modified: branches/2.0-releng/t/11checkout.t
==============================================================================
--- branches/2.0-releng/t/11checkout.t	(original)
+++ branches/2.0-releng/t/11checkout.t	Sun Dec 24 07:50:01 2006
@@ -341,7 +341,7 @@
 
 chdir($corpath);
 rename("$corpath/co-root-deep/there", "$corpath/tmp");
-unlink("$corpath/co-root-deep");
+rmtree ["$corpath/co-root-deep"] or die $!;
 rename("$corpath/tmp", "$corpath/co-root-deep");
 
 is_output ($svk, 'checkout', ['--relocate', __("$corpath/co-root-deep/there"), __("$corpath/co-root-deep")], [