[Bps-public-commit] r14595 - Pushmi/branches/lock/lib/Pushmi

[clkao at bestpractical.com]

Author: clkao
Date: Tue Jul 29 12:13:20 2008
New Revision: 14595

Modified:
   Pushmi/branches/lock/lib/Pushmi/Test.pm

Log:
Make svn command configurable for test.


Modified: Pushmi/branches/lock/lib/Pushmi/Test.pm
==============================================================================
--- Pushmi/branches/lock/lib/Pushmi/Test.pm	(original)
+++ Pushmi/branches/lock/lib/Pushmi/Test.pm	Tue Jul 29 12:13:20 2008
@@ -48,11 +48,18 @@
     }
 }
 
+sub svn_cmd {
+    return $ENV{PUSHMI_SVN_COMMAND} if $ENV{PUSHMI_SVN_COMMAND};
+    return qw(arch -i386 /usr/local/bin/svn) if $^O eq 'darwin';
+    return 'svn';
+}
+
 sub is_svn_output {
     my ($arg, $exp_stdout, $exp_stderr) = @_;
     my $stdout_err = [];
     $exp_stderr ||= [];
-    my $ret = run3 ['svn', ($SVN::Core::VERSION ge '1.5.0'
+
+    my $ret = run3 [svn_cmd(), ($SVN::Core::VERSION ge '1.5.0'
                             ? '--non-interactive' : ()),
                     @$arg], undef,
 	_mk_cmp_closure($exp_stdout, $stdout_err), # stdout