[Bps-public-commit] r14123 - Pushmi/trunk/lib/Pushmi

[clkao at bestpractical.com]

Author: clkao
Date: Tue Jul 15 13:32:33 2008
New Revision: 14123

Modified:
   Pushmi/trunk/lib/Pushmi/Test.pm

Log:
workaround the arch problem on darwin.


Modified: Pushmi/trunk/lib/Pushmi/Test.pm
==============================================================================
--- Pushmi/trunk/lib/Pushmi/Test.pm	(original)
+++ Pushmi/trunk/lib/Pushmi/Test.pm	Tue Jul 15 13:32:33 2008
@@ -114,6 +114,13 @@
     my $ret = `$apache->{httpd} -V`;
     my ($ap_version) = $ret =~ m{version: Apache/([\d.]+)};
 
+    # XXX: on darwin, the system httpd is compiled with x86_64 but the
+    # perl is not.  so loading any perl modules into x86_64 httpd
+    # causes an arch error.  this is to tweak runapp invocation so the
+    # httpd is running under i386.
+    $apache->{binary} = 'arch -i386 '.$apache->{httpd}
+        if $^O eq 'darwin';
+
     $args{extra_modules} ||= [];
     if ($ap_version =~ m/^2\.2/) {
 	$ap_version = '2.2';