passenger 4.0.33 → 4.0.34

data/rpm/passenger_dynamic_thread_group.patch

@@ -0,0 +1,16 @@
+diff --git a/test/oxt/dynamic_thread_group_test.cpp b/test/oxt/dynamic_thread_group_test.cpp
+index 003b7ef..5a90463 100644
+--- a/test/oxt/dynamic_thread_group_test.cpp
++++ b/test/oxt/dynamic_thread_group_test.cpp
+@@ -103,9 +103,9 @@ namespace tut {
+ 	}
+ 	
+ 	static void create_threads(dynamic_thread_group *group) {
+-		for (int i = 1000; i >= 0; i--) {
++		for (int i = 100; i >= 0; i--) {
+ 			boost::function<void ()> f(boost::bind(do_nothing, i * 1000));
+-			group->create_thread(f, "", 256 * 1024);
++			group->create_thread(f, "", 8 * 1024);
+ 		}
+ 	}
+ 	

data/rpm/passenger_tests_default_config_example.patch

@@ -0,0 +1,44 @@
+diff -up ./test/config.json.example.lindefault ./test/config.json.example
+--- ./test/config.json.example.lindefault	2013-05-30 16:04:41.206533618 +0200
++++ ./test/config.json.example	2013-05-30 16:04:34.070449358 +0200
+@@ -10,24 +10,24 @@
+   // otherwise the tests will fail.
+ 
+   //// Good values for OS X:
+-  "normal_user_1": "_www",
+-  "normal_user_2": "daemon",
+-  // Must not be "nobody".
+-  "default_user": "_sandbox",
+-  // Must not be normal_user_1's primary group.
+-  "normal_group_1": "daemon",
+-  // Must not be normal_user_2's primary group.
+-  "normal_group_2": "_sandbox",
+-  // Must not be default_user's primary group. Must not be "nobody".
+-  "default_group": "_www",
+-
+-  ///// Good values for Linux and FreeBSD. Same restrictions apply.
+-  //"normal_user_1": "games",
++  //"normal_user_1": "_www",
+   //"normal_user_2": "daemon",
+-  //"default_user": "man",
++  //// Must not be "nobody".
++  //"default_user": "_sandbox",
++  //// Must not be normal_user_1's primary group.
+   //"normal_group_1": "daemon",
+-  //"normal_group_2": "man",
+-  //"default_group": "games",
++  //// Must not be normal_user_2's primary group.
++  //"normal_group_2": "_sandbox",
++  //// Must not be default_user's primary group. Must not be "nobody".
++  //"default_group": "_www",
++
++  ///// Good values for Linux and FreeBSD. Same restrictions apply.
++  "normal_user_1": "games",
++  "normal_user_2": "daemon",
++  "default_user": "man",
++  "normal_group_1": "daemon",
++  "normal_group_2": "man",
++  "default_group": "games",
+ 
+   // A nonexistant username, group name, user ID and group ID.
+   "nonexistant_user": "xxxxxxxxxxxxxxxxxxx",

data/rpm/rubygem-passenger-4.0.18-GLIBC_HAVE_LONG_LONG.patch

@@ -0,0 +1,21 @@
+diff -urp passenger-release-4.0.18.orig/ext/boost/cstdint.hpp passenger-release-4.0.18/ext/boost/cstdint.hpp
+--- passenger-release-4.0.18.orig/ext/boost/cstdint.hpp	2013-09-17 13:47:54.000000000 -0500
++++ passenger-release-4.0.18/ext/boost/cstdint.hpp	2013-09-23 16:34:02.074450639 -0500
+@@ -41,7 +41,15 @@
+ // so we disable use of stdint.h when GLIBC does not define __GLIBC_HAVE_LONG_LONG.
+ // See https://svn.boost.org/trac/boost/ticket/3548 and http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990
+ //
+-#if defined(BOOST_HAS_STDINT_H) && (!defined(__GLIBC__) || defined(__GLIBC_HAVE_LONG_LONG))
++// This define has been dropped altogether in GLIBC 2.17.  As of then,
++// support for long long is part of baseline requirements, and
++// [u]int64_t is always defined.  See here:
++// http://sourceware.org/ml/libc-alpha/2013-01/msg00440.html
++//
++#if defined(BOOST_HAS_STDINT_H)					\
++  && (!defined(__GLIBC__)					\
++      || defined(__GLIBC_HAVE_LONG_LONG)			\
++      || (defined __GLIBC_PREREQ && __GLIBC_PREREQ(2,17)))
+ 
+ // The following #include is an implementation artifact; not part of interface.
+ # ifdef __hpux
+Only in passenger-release-4.0.18/ext/boost: cstdint.hpp.glibc-long

data/rpm/rubygem-passenger-4.0.18-gcc47-include-sys_types.patch

@@ -0,0 +1,45 @@
+diff -urp passenger-release-4.0.18.orig/ext/common/EventedMessageServer.h passenger-release-4.0.18/ext/common/EventedMessageServer.h
+--- passenger-release-4.0.18.orig/ext/common/EventedMessageServer.h	2013-09-17 13:47:54.000000000 -0500
++++ passenger-release-4.0.18/ext/common/EventedMessageServer.h	2013-09-23 13:59:23.012484647 -0500
+@@ -27,6 +27,7 @@
+ 
+ #include <boost/shared_ptr.hpp>
+ #include <ev++.h>
++#include <sys/types.h>
+ #include <cstdarg>
+ #include <cstdlib>
+ #include <EventedServer.h>
+diff -urp passenger-release-4.0.18.orig/ext/common/FileDescriptor.h passenger-release-4.0.18/ext/common/FileDescriptor.h
+--- passenger-release-4.0.18.orig/ext/common/FileDescriptor.h	2013-09-17 13:47:54.000000000 -0500
++++ passenger-release-4.0.18/ext/common/FileDescriptor.h	2013-09-23 13:59:23.013484647 -0500
+@@ -30,6 +30,7 @@
+ #include <oxt/system_calls.hpp>
+ 
+ #include <utility>
++#include <sys/types.h>
+ #include <unistd.h>
+ #include <cerrno>
+ 
+diff -urp passenger-release-4.0.18.orig/ext/common/Utils/BufferedIO.h passenger-release-4.0.18/ext/common/Utils/BufferedIO.h
+--- passenger-release-4.0.18.orig/ext/common/Utils/BufferedIO.h	2013-09-17 13:47:54.000000000 -0500
++++ passenger-release-4.0.18/ext/common/Utils/BufferedIO.h	2013-09-23 13:59:23.014484646 -0500
+@@ -1,6 +1,7 @@
+ #ifndef _PASSENGER_BUFFERED_IO_H_
+ #define _PASSENGER_BUFFERED_IO_H_
+ 
++#include <sys/types.h>
+ #include <string>
+ #include <utility>
+ #include <algorithm>
+diff -urp passenger-release-4.0.18.orig/ext/common/Utils/StreamBoyerMooreHorspool.h passenger-release-4.0.18/ext/common/Utils/StreamBoyerMooreHorspool.h
+--- passenger-release-4.0.18.orig/ext/common/Utils/StreamBoyerMooreHorspool.h	2013-09-17 13:47:54.000000000 -0500
++++ passenger-release-4.0.18/ext/common/Utils/StreamBoyerMooreHorspool.h	2013-09-23 13:59:23.015484645 -0500
+@@ -189,7 +189,7 @@
+ 	#endif
+ #endif
+ 
+-
++#include <sys/types.h>
+ #include <cstddef>
+ #include <cstring>
+ #include <cassert>

data/test/config.json.rpm-automation

@@ -0,0 +1,15 @@
+{
+  "normal_user_1": "games",
+  "normal_user_2": "daemon",
+  "default_user": "gopher",
+  "normal_group_1": "daemon",
+  "normal_group_2": "gopher",
+  "default_group": "games",
+
+  "nonexistant_user": "xxxxxxxxxxxxxxxxxxx",
+  "nonexistant_group": "xxxxxxxxxxxxxxxxxxx",
+  "nonexistant_uid": 9999,
+  "nonexistant_gid": 9999,
+
+  "nginx": "/tmp/nginx/sbin/nginx"
+}

data/test/integration_tests/downloaded_binaries_tests.rb

@@ -1,9 +1,37 @@
+# encoding: utf-8
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2013-2014 Phusion
+#
+#  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
+
+# These tests are run by passenger_autobuilder, right after it has built binaries.
+# passenger_autobuilder populates the download_cache directory and runs this test script.
+
 source_root = File.expand_path("../..", File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{source_root}/lib")
 require 'phusion_passenger'
 PhusionPassenger.locate_directories
 require 'tmpdir'
 require 'fileutils'
+require 'webrick'
 require 'open-uri'
 
 ENV['PATH'] = "#{PhusionPassenger.bin_dir}:#{ENV['PATH']}"
@@ -32,7 +60,20 @@ describe "Downloaded Phusion Passenger binaries" do
 		end
 	end
 
-	it "works" do
+	def start_server(document_root)
+		server = WEBrick::HTTPServer.new(:BindAddress => '127.0.0.1',
+			:Port => 0,
+			:DocumentRoot => document_root,
+			:Logger => WEBrick::Log.new("/dev/null"),
+			:AccessLog => [])
+		Thread.new do
+			Thread.current.abort_on_exception = true
+			server.start
+		end
+		[server, "http://127.0.0.1:#{server.config[:Port]}"]
+	end
+
+	specify "Passenger Standalone is able to use the binaries" do
 		Dir.mkdir("#{@temp_dir}/#{version}")
 		Dir.chdir("#{@temp_dir}/#{version}") do
 			tarballs = Dir["#{PhusionPassenger.download_cache_dir}/*.tar.gz"]
@@ -73,4 +114,41 @@ describe "Downloaded Phusion Passenger binaries" do
 			end
 		end
 	end
-end
+
+	specify "helper-scripts/download_binaries/extconf.rb succeeds in downloading all necessary binaries" do
+		FileUtils.mkdir_p("server_root")
+		server, url_root = start_server("server_root")
+		File.rename("download_cache", "download_cache.old")
+		begin
+			FileUtils.cp_r("download_cache.old", "server_root/#{PhusionPassenger::VERSION_STRING}")
+			sh "cd #{PhusionPassenger.source_root} && " +
+				"env BINARIES_URL_ROOT=#{url_root} " +
+				"ruby helper-scripts/download_binaries/extconf.rb --abort-on-error"
+			Dir["download_cache/*"].should_not be_empty
+		ensure
+			File.unlink("Makefile") rescue nil
+			FileUtils.rm_rf("download_cache")
+			FileUtils.rm_rf("server_root")
+			File.rename("download_cache.old", "download_cache")
+			server.stop
+		end
+	end
+
+	specify "helper-scripts/download_binaries/extconf.rb fails at downloading all necessary binaries if one of them does not exist" do
+		FileUtils.mkdir_p("server_root")
+		server, url_root = start_server("server_root")
+		File.rename("download_cache", "download_cache.old")
+		begin
+			result = system "cd #{PhusionPassenger.source_root} && " +
+				"env BINARIES_URL_ROOT=#{url_root} " +
+				"ruby helper-scripts/download_binaries/extconf.rb --abort-on-error"
+			result.should be_false
+		ensure
+			File.unlink("Makefile") rescue nil
+			FileUtils.rm_rf("download_cache")
+			FileUtils.rm_rf("server_root")
+			File.rename("download_cache.old", "download_cache")
+			server.stop
+		end
+	end
+end

data/test/integration_tests/native_packaging_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2013 Phusion
+#  Copyright (c) 2013-2014 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -22,36 +22,90 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-# To run the native packaging tests:
-#     rake debian:dev debian:dev:reinstall
-#     rvmsudo env LOCATIONS_INI=/usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini \
-#         rspec -f s -c test/integration_tests/native_packaging_spec.rb
-
-# Ensure that the natively installed tools are in PATH.
-ENV['PATH'] = "/usr/bin:#{ENV['PATH']}"
 LOCATIONS_INI = ENV['LOCATIONS_INI']
 abort "Please set the LOCATIONS_INI environment variable to the right locations.ini" if !LOCATIONS_INI
 
 NATIVE_PACKAGING_METHOD = ENV['NATIVE_PACKAGING_METHOD']
-abort "Please set NATIVE_PACKAGING_METHOD to either 'deb' or 'rpm'" if !["deb", "rpm"].include?(NATIVE_PACKAGING_METHOD)
+if !["deb", "rpm", "homebrew"].include?(NATIVE_PACKAGING_METHOD)
+	abort "Please set NATIVE_PACKAGING_METHOD to either 'deb', 'rpm' or 'homebrew'"
+end
 
 source_root = File.expand_path("../..", File.dirname(__FILE__))
 $LOAD_PATH.unshift("#{source_root}/lib")
 require 'phusion_passenger'
 PhusionPassenger.locate_directories
+PhusionPassenger.require_passenger_lib 'config/validate_install_command'
 require 'tmpdir'
 require 'fileutils'
 require 'open-uri'
+require 'pathname'
 
-BINDIR = "/usr/bin"
-SBINDIR = "/usr/sbin"
-INCLUDEDIR = "/usr/share/#{PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME}/include"
-NGINX_ADDON_DIR = "/usr/share/#{PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME}/ngx_http_passenger_module"
-DOCDIR = "/usr/share/doc/passenger"
-RESOURCESDIR = "/usr/share/#{PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME}"
-RUBY_EXTENSION_SOURCE_DIR = "/usr/share/#{PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME}/ruby_extension_source"
-AGENTS_DIR = "/usr/lib/#{PhusionPassenger::GLOBAL_NAMESPACE_DIRNAME}/agents"
-APACHE2_MODULE_PATH = "/usr/lib/apache2/modules/mod_passenger.so"
+
+# Ensure that the natively installed tools are in PATH.
+ENV['PATH'] = "/usr/bin:/usr/sbin:#{ENV['PATH']}"
+# Force Rake to redirect stderr to stdout so that we can capture all output.
+ENV['STDERR_TO_STDOUT'] = '1'
+
+
+module PhusionPassenger
+
+case NATIVE_PACKAGING_METHOD
+when "deb"
+	BINDIR = "/usr/bin"
+	SBINDIR = "/usr/sbin"
+	INCLUDEDIR = "/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/include"
+	NGINX_ADDON_DIR = "/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/ngx_http_passenger_module"
+	DOCDIR = "/usr/share/doc/passenger"
+	HELPER_SCRIPTS_DIR = "/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/helper-scripts"
+	RUBY_EXTENSION_SOURCE_DIR = "/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/ruby_extension_source"
+	AGENTS_DIR = "/usr/lib/#{GLOBAL_NAMESPACE_DIRNAME}/agents"
+	APACHE2_MODULE_PATH = "/usr/lib/apache2/modules/mod_passenger.so"
+	SUPPORTS_COMPILING_APACHE_MODULE = false
+
+	APXS2 = "/usr/bin/apxs2"
+	APACHE2 = "/usr/sbin/apache2"
+	APACHE2CTL = "/usr/sbin/apache2ctl"
+	APACHE_CONFIG_FILE = "/etc/apache2/apache2.conf"
+	APACHE_ERROR_LOG = "/var/log/apache2/error.log"
+when "rpm"
+	BINDIR = "/usr/bin"
+	SBINDIR = "/usr/sbin"
+	INCLUDEDIR = "/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/include"
+	NGINX_ADDON_DIR = "/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/ngx_http_passenger_module"
+	DOCDIR = "/usr/share/doc/passenger"
+	HELPER_SCRIPTS_DIR = "/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/helper-scripts"
+	RUBY_EXTENSION_SOURCE_DIR = "/usr/share/#{GLOBAL_NAMESPACE_DIRNAME}/ruby_extension_source"
+	AGENTS_DIR = "/usr/lib64/#{GLOBAL_NAMESPACE_DIRNAME}/agents"
+	APACHE2_MODULE_PATH = "/usr/lib64/httpd/modules/mod_passenger.so"
+	SUPPORTS_COMPILING_APACHE_MODULE = false
+
+	APXS2 = "/usr/sbin/apxs"
+	APACHE2 = "/usr/sbin/httpd"
+	APACHE2CTL = "/usr/sbin/apachectl"
+	APACHE_CONFIG_FILE = "/etc/httpd/conf/httpd.conf"
+	APACHE_ERROR_LOG = "/etc/httpd/logs/error_log"
+when "homebrew"
+	# Ensure that the Homebrew-installed Phusion Passenger is the first in PATH.
+	ENV['PATH'] = "/usr/local/bin:#{ENV['PATH']}"
+	root = "/usr/local/Cellar/passenger/#{VERSION_STRING}/libexec"
+
+	BINDIR = "#{root}/bin"
+	SBINDIR = BINDIR
+	INCLUDEDIR = "#{root}/ext"
+	NGINX_ADDON_DIR = "#{root}/ext/nginx"
+	DOCDIR = "#{root}/doc"
+	HELPER_SCRIPTS_DIR = "#{root}/helper-scripts"
+	RUBY_EXTENSION_SOURCE_DIR = "#{root}/ext/ruby"
+	AGENTS_DIR = "#{root}/buildout/agents"
+	APACHE2_MODULE_PATH = "#{root}/buildout/apache2/mod_passenger.so"
+	SUPPORTS_COMPILING_APACHE_MODULE = true
+
+	APXS2 = "/usr/sbin/apxs"
+	APACHE2 = "/usr/sbin/httpd"
+	APACHE2CTL = "/usr/sbin/apachectl"
+	APACHE_CONFIG_FILE = "/private/etc/apache2/httpd.conf"
+	APACHE_ERROR_LOG = "/private/var/log/apache2/error_log"
+end
 
 describe "A natively packaged Phusion Passenger" do
 	def capture_output(command)
@@ -67,12 +121,33 @@ describe "A natively packaged Phusion Passenger" do
 		return capture_output("which #{command}")
 	end
 
+	def realpath(path)
+		Pathname.new(path).realpath.to_s
+	end
+
 	def sh(*command)
 		if !system(*command)
 			abort "Command failed: #{command.join(' ')}"
 		end
 	end
 
+	def install_apache2_module
+		orig_mtime = File.stat(APACHE2_MODULE_PATH).mtime
+		output = capture_output("passenger-install-apache2-module --auto 2>&1")
+		output.should include("Almost there!")
+		output.should include("LoadModule passenger_module #{APACHE2_MODULE_PATH}\n")
+		output.should include("PassengerRoot #{LOCATIONS_INI}\n")
+		File.stat(APACHE2_MODULE_PATH).mtime.should_not == orig_mtime
+	end
+
+	def install_nginx_module
+		Dir.mktmpdir do |path|
+			output = capture_output("passenger-install-nginx-module --auto --prefix=#{path} --auto-download 2>&1")
+			output.should include("passenger_root #{LOCATIONS_INI};")
+			File.exist?("#{path}/sbin/nginx").should be_true
+		end
+	end
+
 	specify "locations.ini only refers to existent filesystem locations" do
 		File.read(LOCATIONS_INI).split("\n").each do |line|
 			if line =~ /=/
@@ -89,7 +164,7 @@ describe "A natively packaged Phusion Passenger" do
 	end
 
 	specify "passenger-status is in #{SBINDIR}" do
-		which("passenger-status").should == "#{SBINDIR}/passenger-status"
+		realpath(which("passenger-status")).should == "#{SBINDIR}/passenger-status"
 	end
 
 	specify "the Nginx runtime library headers exist" do
@@ -107,9 +182,9 @@ describe "A natively packaged Phusion Passenger" do
 		File.file?("#{DOCDIR}/Users guide Apache.html").should be_true
 	end
 
-	specify "the resources directory exists" do
-		File.directory?(RESOURCESDIR).should be_true
-		File.file?("#{RESOURCESDIR}/helper-scripts/rack-loader.rb").should be_true
+	specify "the helper-scripts directory exists" do
+		File.directory?(HELPER_SCRIPTS_DIR).should be_true
+		File.file?("#{HELPER_SCRIPTS_DIR}/rack-loader.rb").should be_true
 	end
 
 	specify "the Ruby extension source directory exists" do
@@ -129,7 +204,7 @@ describe "A natively packaged Phusion Passenger" do
 
 	describe "passenger-config" do
 		it "passenger-config is in #{BINDIR}" do
-			which("passenger-config").should == "#{BINDIR}/passenger-config"
+			realpath(which("passenger-config")).should == "#{BINDIR}/passenger-config"
 		end
 
 		it "shows the path to locations.ini" do
@@ -152,19 +227,19 @@ describe "A natively packaged Phusion Passenger" do
 			output = capture_output("passenger-config --detect-apache2")
 			output.gsub!(/.*Final autodetection results\n/m, '')
 			output.scan(/\* Found Apache .*\!/).size.should == 1
-			output.should include("apxs2          : /usr/bin/apxs2\n")
-			output.should include("Main executable: /usr/sbin/apache2\n")
-			output.should include("Control command: /usr/sbin/apache2ctl\n")
-			output.should include("Config file    : /etc/apache2/apache2.conf\n")
-			output.should include("Error log file : /var/log/apache2/error.log\n")
+			output.should include("apxs2          : #{APXS2}\n")
+			output.should include("Main executable: #{APACHE2}\n")
+			output.should include("Control command: #{APACHE2CTL}\n")
+			output.should include("Config file    : #{APACHE_CONFIG_FILE}\n")
+			output.should include("Error log file : #{APACHE_ERROR_LOG}\n")
 			output.should include(%Q{
    To start, stop or restart this specific Apache version:
-      /usr/sbin/apache2ctl start
-      /usr/sbin/apache2ctl stop
-      /usr/sbin/apache2ctl restart})
+      #{APACHE2CTL} start
+      #{APACHE2CTL} stop
+      #{APACHE2CTL} restart})
 			output.should include(%Q{
    To troubleshoot, please read the logs in this file:
-      /var/log/apache2/error.log})
+      #{APACHE_ERROR_LOG}})
 		end
 
 		it "shows the directory to the runtime library headers" do
@@ -182,11 +257,16 @@ describe "A natively packaged Phusion Passenger" do
 				File.file?(lib).should be_true
 			end
 		end
+
+		it "validates the install as working" do
+			system("passenger-config validate-install >/dev/null 2>/dev/null")
+			[0, Config::ValidateInstallCommand::WARN_EXIT_CODE].should include($?.exitstatus)
+		end
 	end
 
 	describe "passenger-memory-stats" do
 		it "is in #{SBINDIR}" do
-			which("passenger-memory-stats").should == "#{SBINDIR}/passenger-memory-stats"
+			realpath(which("passenger-memory-stats")).should == "#{SBINDIR}/passenger-memory-stats"
 		end
 
 		it "works" do
@@ -196,32 +276,42 @@ describe "A natively packaged Phusion Passenger" do
 
 	describe "passenger-install-apache2-module" do
 		it "is in #{BINDIR}" do
-			which("passenger-install-apache2-module").should == "#{BINDIR}/passenger-install-apache2-module"
+			realpath(which("passenger-install-apache2-module")).should == "#{BINDIR}/passenger-install-apache2-module"
 		end
 
-		it "checks whether the Apache module is installed" do
-			output = capture_output("passenger-install-apache2-module --auto")
-			output.should =~ /Apache module is correctly installed/
+		if SUPPORTS_COMPILING_APACHE_MODULE
+			it "is able to compile the Apache module and doesn't break passenger-install-nginx-module" do
+				install_apache2_module
+				install_nginx_module
+			end
+		else
+			it "checks whether the Apache module is installed" do
+				output = capture_output("passenger-install-apache2-module --auto 2>&1")
+				output.should =~ /Apache module is correctly installed/
+			end
 		end
 	end
 
 	describe "passenger-install-nginx-module" do
 		it "is in #{BINDIR}" do
-			which("passenger-install-nginx-module").should == "#{BINDIR}/passenger-install-nginx-module"
+			realpath(which("passenger-install-nginx-module")).should == "#{BINDIR}/passenger-install-nginx-module"
 		end
 
-		it "is able to compile Nginx" do
-			Dir.mktmpdir do |path|
-				output = capture_output("passenger-install-nginx-module --auto --prefix=#{path} --auto-download 2>&1")
-				output.should include("passenger_root #{LOCATIONS_INI};")
-				File.exist?("#{path}/sbin/nginx").should be_true
+		if SUPPORTS_COMPILING_APACHE_MODULE
+			it "is able to compile Nginx and doesn't break passenger-install-apache2-module" do
+				install_nginx_module
+				install_apache2_module
+			end
+		else
+			it "is able to compile Nginx" do
+				install_nginx_module
 			end
 		end
 	end
 
 	describe "Passenger Standalone" do
 		it "is in #{BINDIR}" do
-			which("passenger").should == "#{BINDIR}/passenger"
+			realpath(which("passenger")).should == "#{BINDIR}/passenger"
 		end
 
 		it "works" do
@@ -251,3 +341,5 @@ describe "A natively packaged Phusion Passenger" do
 		end
 	end
 end
+
+end # module PhusionPassenger