passenger 4.0.5 → 4.0.6

data/test/cxx/ApplicationPool2/DirectSpawnerTest.cpp

@@ -43,7 +43,7 @@ namespace tut {
 		}
 
 		void _gatherOutput(const char *data, unsigned int size) {
-			lock_guard<boost::mutex> l(gatheredOutputSyncher);
+			boost::lock_guard<boost::mutex> l(gatheredOutputSyncher);
 			gatheredOutput.append(data, size);
 		}
 	};
@@ -58,7 +58,7 @@ namespace tut {
 		// SpawnException error page.
 		Options options = createOptions();
 		options.appRoot      = "stub";
-		options.startCommand = "perl\1" "-e\1" "print STDERR \"hello world\\n\"; sleep(60)";
+		options.startCommand = "perl\t" "-e\t" "print STDERR \"hello world\\n\"; sleep(60)";
 		options.startupFile  = ".";
 		options.startTimeout = 300;
 		
@@ -82,7 +82,7 @@ namespace tut {
 		// as error response instead.
 		Options options = createOptions();
 		options.appRoot      = "stub";
-		options.startCommand = "perl\1" "-e\1" "print STDERR \"hello world\\n\"";
+		options.startCommand = "perl\t" "-e\t" "print STDERR \"hello world\\n\"";
 		options.startupFile  = ".";
 		
 		DirectSpawner spawner(bg.safe, *resourceLocator, generation);
@@ -105,7 +105,7 @@ namespace tut {
 		// https://code.google.com/p/phusion-passenger/issues/detail?id=842#c19
 		Options options = createOptions();
 		options.appRoot      = "stub/rack";
-		options.startCommand = "ruby\1" "start.rb\1" "--execself";
+		options.startCommand = "ruby\t" "start.rb\t" "--execself";
 		options.startupFile  = "start.rb";
 		SpawnerPtr spawner = createSpawner(options);
 		process = spawner->spawn(options);

data/test/cxx/ApplicationPool2/PoolTest.cpp

@@ -81,7 +81,7 @@ namespace tut {
 			Options options;
 			options.spawnMethod = "dummy";
 			options.appRoot = "stub/rack";
-			options.startCommand = "ruby\1" "start.rb";
+			options.startCommand = "ruby\t" "start.rb";
 			options.startupFile  = "start.rb";
 			options.loadShellEnvvars = false;
 			options.user = testConfig["normal_user_1"].asCString();

data/test/cxx/ApplicationPool2/SmartSpawnerTest.cpp

@@ -61,7 +61,7 @@ namespace tut {
 		}
 
 		void _gatherOutput(const char *data, unsigned int size) {
-			lock_guard<boost::mutex> l(gatheredOutputSyncher);
+			boost::lock_guard<boost::mutex> l(gatheredOutputSyncher);
 			gatheredOutput.append(data, size);
 		}
 	};
@@ -75,7 +75,7 @@ namespace tut {
 		// restart it and try again.
 		Options options = createOptions();
 		options.appRoot      = "stub/rack";
-		options.startCommand = "ruby\1" "start.rb";
+		options.startCommand = "ruby\t" "start.rb";
 		options.startupFile  = "start.rb";
 		shared_ptr<SmartSpawner> spawner = createSpawner(options);
 		process = spawner->spawn(options);
@@ -96,7 +96,7 @@ namespace tut {
 		// SmartSpawner will throw an exception.
 		Options options = createOptions();
 		options.appRoot      = "stub/rack";
-		options.startCommand = "ruby\1" "start.rb";
+		options.startCommand = "ruby\t" "start.rb";
 		options.startupFile  = "start.rb";
 		setLogLevel(-1);
 		shared_ptr<SmartSpawner> spawner = createSpawner(options, true);
@@ -115,7 +115,7 @@ namespace tut {
 		// whatever stderr output as error page.
 		Options options = createOptions();
 		options.appRoot      = "stub/rack";
-		options.startCommand = "ruby\1" "start.rb";
+		options.startCommand = "ruby\t" "start.rb";
 		options.startupFile  = "start.rb";
 		options.startTimeout = 300;
 		
@@ -148,7 +148,7 @@ namespace tut {
 		// as error response instead.
 		Options options = createOptions();
 		options.appRoot      = "stub/rack";
-		options.startCommand = "ruby\1" "start.rb";
+		options.startCommand = "ruby\t" "start.rb";
 		options.startupFile  = "start.rb";
 		
 		vector<string> preloaderCommand;
@@ -179,7 +179,7 @@ namespace tut {
 		// takes note of the process's environment variables.
 		Options options = createOptions();
 		options.appRoot      = "stub/rack";
-		options.startCommand = "ruby\1" "start.rb";
+		options.startCommand = "ruby\t" "start.rb";
 		options.startupFile  = "start.rb";
 		options.environmentVariables.push_back(make_pair("PASSENGER_FOO", "foo"));
 		
@@ -241,7 +241,7 @@ namespace tut {
 		shutdown(session->fd(), SHUT_WR);
 		readAll(session->fd());
 		EVENTUALLY(2,
-			lock_guard<boost::mutex> l(gatheredOutputSyncher);
+			boost::lock_guard<boost::mutex> l(gatheredOutputSyncher);
 			result = gatheredOutput.find("hello world!\n") != string::npos;
 		);
 	}

data/test/cxx/ApplicationPool2/SpawnerTestCases.cpp

@@ -78,7 +78,7 @@
 		// Basic spawning test.
 		Options options = createOptions();
 		options.appRoot      = "stub/rack";
-		options.startCommand = "ruby\1" "start.rb";
+		options.startCommand = "ruby\t" "start.rb";
 		options.startupFile  = "start.rb";
 		SpawnerPtr spawner = createSpawner(options);
 		process = spawner->spawn(options);
@@ -95,7 +95,7 @@
 		// It enforces the given start timeout.
 		Options options = createOptions();
 		options.appRoot      = "stub";
-		options.startCommand = "sleep\1" "60";
+		options.startCommand = "sleep\t" "60";
 		options.startupFile  = ".";
 		options.startTimeout = 300;
 		SpawnerPtr spawner = createSpawner(options);
@@ -114,7 +114,7 @@
 		// in exceptions.
 		Options options = createOptions();
 		options.appRoot      = "stub";
-		options.startCommand = "echo\1" "!> hello world";
+		options.startCommand = "echo\t" "!> hello world";
 		options.startupFile  = ".";
 		SpawnerPtr spawner = createSpawner(options);
 		try {
@@ -132,7 +132,7 @@
 		// which will result in a SpawnException with the content.
 		Options options = createOptions();
 		options.appRoot      = "stub";
-		options.startCommand = "perl\1" "start_error.pl";
+		options.startCommand = "perl\t" "start_error.pl";
 		options.startupFile  = "start_error.pl";
 		SpawnerPtr spawner = createSpawner(options);
 		try {
@@ -153,7 +153,7 @@
 		// response.
 		Options options = createOptions();
 		options.appRoot      = "stub";
-		options.startCommand = "perl\1" "start_error.pl\1" "freeze";
+		options.startCommand = "perl\t" "start_error.pl\t" "freeze";
 		options.startupFile  = "start_error.pl";
 		options.startTimeout = 300;
 		SpawnerPtr spawner = createSpawner(options);
@@ -171,7 +171,7 @@
 		// The reported PID is correct.
 		Options options = createOptions();
 		options.appRoot      = "stub/rack";
-		options.startCommand = "ruby\1" "start.rb";
+		options.startCommand = "ruby\t" "start.rb";
 		options.startupFile  = "start.rb";
 		SpawnerPtr spawner = createSpawner(options);
 		process = spawner->spawn(options);
@@ -188,7 +188,7 @@
 		// Custom environment variables can be passed.
 		Options options = createOptions();
 		options.appRoot = "stub/rack";
-		options.startCommand = "ruby\1" "start.rb";
+		options.startCommand = "ruby\t" "start.rb";
 		options.startupFile  = "start.rb";
 		options.environmentVariables.push_back(make_pair("PASSENGER_FOO", "foo"));
 		options.environmentVariables.push_back(make_pair("PASSENGER_BAR", "bar"));
@@ -209,7 +209,7 @@
 		// Any raised SpawnExceptions take note of the process's environment variables.
 		Options options = createOptions();
 		options.appRoot      = "stub";
-		options.startCommand = "echo\1" "!> hello world";
+		options.startCommand = "echo\t" "!> hello world";
 		options.startupFile  = ".";
 		options.environmentVariables.push_back(make_pair("PASSENGER_FOO", "foo"));
 		SpawnerPtr spawner = createSpawner(options);
@@ -312,7 +312,7 @@
 		process.reset();
 
 		EVENTUALLY(2,
-			lock_guard<boost::mutex> l(gatheredOutputSyncher);
+			boost::lock_guard<boost::mutex> l(gatheredOutputSyncher);
 			result = gatheredOutput.find("hello stdout!\n") != string::npos
 				&& gatheredOutput.find("hello stderr!\n") != string::npos;
 		);

data/test/cxx/EventedBufferedInputTest.cpp

@@ -25,7 +25,7 @@ namespace tut {
 		virtual ssize_t readSocket(void *buf, size_t n) {
 			int readError;
 			{
-				lock_guard<boost::mutex> l(syncher);
+				boost::lock_guard<boost::mutex> l(syncher);
 				readError = this->readError;
 			}
 			if (readError == 0) {
@@ -37,14 +37,14 @@ namespace tut {
 		}
 
 		void setReadError(int code) {
-			lock_guard<boost::mutex> l(syncher);
+			boost::lock_guard<boost::mutex> l(syncher);
 			readError = code;
 		}
 
 		virtual void afterProcessingBuffer() {
 			function<void ()> onAfterProcessingBuffer;
 			{
-				lock_guard<boost::mutex> l(syncher);
+				boost::lock_guard<boost::mutex> l(syncher);
 				onAfterProcessingBuffer = this->onAfterProcessingBuffer;
 			}
 			if (onAfterProcessingBuffer) {
@@ -80,7 +80,7 @@ namespace tut {
 
 		static size_t onData(const EventedBufferedInputPtr &input, const StaticString &data) {
 			EventedBufferedInputTest *self = (EventedBufferedInputTest *) input->userData;
-			lock_guard<boost::mutex> l(self->syncher);
+			boost::lock_guard<boost::mutex> l(self->syncher);
 			self->counter++;
 			if (data.empty()) {
 				self->log.append("EOF\n");
@@ -96,12 +96,12 @@ namespace tut {
 
 		static void onError(const EventedBufferedInputPtr &input, const char *message, int code) {
 			EventedBufferedInputTest *self = (EventedBufferedInputTest *) input->userData;
-			lock_guard<boost::mutex> l(self->syncher);
+			boost::lock_guard<boost::mutex> l(self->syncher);
 			self->log.append("Error: " + toString(code) + "\n");
 		}
 
 		unsigned int getCounter() {
-			lock_guard<boost::mutex> l(syncher);
+			boost::lock_guard<boost::mutex> l(syncher);
 			return counter;
 		}
 
@@ -124,13 +124,13 @@ namespace tut {
 		}
 
 		void logEbiIsStarted() {
-			lock_guard<boost::mutex> l(syncher);
+			boost::lock_guard<boost::mutex> l(syncher);
 			log.append("isStarted: " + toString(ebi->isStarted()) + "\n");
 			log.append("isSocketStarted: " + toString(ebi->isSocketStarted()) + "\n");
 		}
 	};
 
-	#define LOCK() lock_guard<boost::mutex> l(syncher)
+	#define LOCK() boost::lock_guard<boost::mutex> l(syncher)
 
 	#define DEFINE_ON_DATA_METHOD(name, code) \
 		static size_t name(const EventedBufferedInputPtr &input, const StaticString &data) { \
@@ -439,7 +439,7 @@ namespace tut {
 		)
 
 		static void on_after_processing_buffer_20(EventedBufferedInputTest *self) {
-			lock_guard<boost::mutex> l(self->syncher);
+			boost::lock_guard<boost::mutex> l(self->syncher);
 			if (self->counter == 1) {
 				self->log.append("Finished first onData; isSocketStarted: " +
 					toString(self->ebi->isSocketStarted()) + "\n");
@@ -485,7 +485,7 @@ namespace tut {
 			static void on_after_processing_buffer_21(EventedBufferedInputTest *self) {
 				if (self->getCounter() == 1) {
 					self->ebi->stop();
-					lock_guard<boost::mutex> l(self->syncher);
+					boost::lock_guard<boost::mutex> l(self->syncher);
 					self->log.append("isSocketStarted: " +
 						toString(self->ebi->isSocketStarted()) + "\n");
 				}
@@ -511,13 +511,13 @@ namespace tut {
 				if (self->getCounter() == 1) {
 					self->ebi->stop();
 					{
-						lock_guard<boost::mutex> l(self->syncher);
+						boost::lock_guard<boost::mutex> l(self->syncher);
 						self->log.append("Paused; isSocketStarted: " +
 							toString(self->ebi->isSocketStarted()) + "\n");
 					}
 					self->ebi->start();
 					{
-						lock_guard<boost::mutex> l(self->syncher);
+						boost::lock_guard<boost::mutex> l(self->syncher);
 						self->log.append("Resumed; isSocketStarted: " +
 							toString(self->ebi->isSocketStarted()) + "\n");
 					}
@@ -564,19 +564,19 @@ namespace tut {
 				if (self->getCounter() == 1) {
 					self->ebi->stop();
 					{
-						lock_guard<boost::mutex> l(self->syncher);
+						boost::lock_guard<boost::mutex> l(self->syncher);
 						self->log.append("Paused; isSocketStarted: " +
 							toString(self->ebi->isSocketStarted()) + "\n");
 					}
 					self->ebi->start();
 					{
-						lock_guard<boost::mutex> l(self->syncher);
+						boost::lock_guard<boost::mutex> l(self->syncher);
 						self->log.append("Resumed; isSocketStarted: " +
 							toString(self->ebi->isSocketStarted()) + "\n");
 					}
 					self->ebi->stop();
 					{
-						lock_guard<boost::mutex> l(self->syncher);
+						boost::lock_guard<boost::mutex> l(self->syncher);
 						self->log.append("Paused again; isSocketStarted: " +
 							toString(self->ebi->isSocketStarted()) + "\n");
 					}
@@ -660,7 +660,7 @@ namespace tut {
 			)
 
 			static void on_after_processing_buffer_25(EventedBufferedInputTest *self) {
-				lock_guard<boost::mutex> l(self->syncher);
+				boost::lock_guard<boost::mutex> l(self->syncher);
 				if (self->counter == 1) {
 					self->log.append("Handler done; isSocketStarted: " +
 						toString(self->ebi->isSocketStarted()) + "\n");
@@ -707,7 +707,7 @@ namespace tut {
 			)
 
 			static void on_after_processing_buffer_26(EventedBufferedInputTest *self) {
-				lock_guard<boost::mutex> l(self->syncher);
+				boost::lock_guard<boost::mutex> l(self->syncher);
 				if (self->counter == 1) {
 					self->log.append("Handler done; isSocketStarted: " +
 						toString(self->ebi->isSocketStarted()) + "\n");

data/test/cxx/RequestHandlerTest.cpp

@@ -323,7 +323,7 @@ namespace tut {
 		sendHeaders(defaultHeaders,
 			"PASSENGER_APP_ROOT", (root + "/test/tmp.handler").c_str(),
 			"PASSENGER_APP_TYPE", "",
-			"PASSENGER_START_COMMAND", ("ruby\1" + root + "/test/tmp.handler/start.rb").c_str(),
+			"PASSENGER_START_COMMAND", ("ruby\t" + root + "/test/tmp.handler/start.rb").c_str(),
 			"PATH_INFO", "/",
 			NULL);
 		string response = readAll(connection);
@@ -348,7 +348,7 @@ namespace tut {
 		sendHeaders(defaultHeaders,
 			"PASSENGER_APP_ROOT", (root + "/test/tmp.handler").c_str(),
 			"PASSENGER_APP_TYPE", "",
-			"PASSENGER_START_COMMAND", ("ruby\1" + root + "/test/tmp.handler/start.rb").c_str(),
+			"PASSENGER_START_COMMAND", ("ruby\t" + root + "/test/tmp.handler/start.rb").c_str(),
 			"PATH_INFO", "/",
 			NULL);
 		string response = readAll(connection);
@@ -371,7 +371,7 @@ namespace tut {
 		sendHeaders(defaultHeaders,
 			"PASSENGER_APP_ROOT", (root + "/test/tmp.handler").c_str(),
 			"PASSENGER_APP_TYPE", "",
-			"PASSENGER_START_COMMAND", ("ruby\1" + root + "/test/tmp.handler/start.rb").c_str(),
+			"PASSENGER_START_COMMAND", ("ruby\t" + root + "/test/tmp.handler/start.rb").c_str(),
 			"PASSENGER_RAISE_INTERNAL_ERROR", "true",
 			"PATH_INFO", "/",
 			NULL);
@@ -399,7 +399,7 @@ namespace tut {
 		sendHeaders(defaultHeaders,
 			"PASSENGER_APP_ROOT", (root + "/test/tmp.handler").c_str(),
 			"PASSENGER_APP_TYPE", "",
-			"PASSENGER_START_COMMAND", ("ruby\1" + root + "/test/tmp.handler/start.rb").c_str(),
+			"PASSENGER_START_COMMAND", ("ruby\t" + root + "/test/tmp.handler/start.rb").c_str(),
 			"PASSENGER_STATUS_LINE", "false",
 			"PATH_INFO", "/",
 			NULL);
@@ -425,7 +425,7 @@ namespace tut {
 		sendHeaders(defaultHeaders,
 			"PASSENGER_APP_ROOT", (root + "/test/tmp.handler").c_str(),
 			"PASSENGER_APP_TYPE", "",
-			"PASSENGER_START_COMMAND", ("ruby\1" + root + "/test/tmp.handler/start.rb").c_str(),
+			"PASSENGER_START_COMMAND", ("ruby\t" + root + "/test/tmp.handler/start.rb").c_str(),
 			"PASSENGER_FRIENDLY_ERROR_PAGES", "false",
 			"PATH_INFO", "/",
 			NULL);

data/test/cxx/ServerInstanceDirTest.cpp

@@ -58,9 +58,11 @@ namespace tut {
 	}
 	
 	TEST_METHOD(5) {
-		// The destructor doesnn't remove the server instance directory if it
+		// The destructor doesn't remove the server instance directory if it
 		// wasn't created with the ownership flag or if it's been detached.
 		string path, path2;
+		makeDirTree(parentDir + "/passenger-test.1234");
+		makeDirTree(parentDir + "/passenger-test.5678");
 		{
 			ServerInstanceDir dir(parentDir + "/passenger-test.1234", false);
 			ServerInstanceDir dir2(parentDir + "/passenger-test.5678", false);

data/test/cxx/TestSupport.h

@@ -264,12 +264,12 @@ public:
 	}
 	
 	int get() const {
-		lock_guard<boost::mutex> l(lock);
+		boost::lock_guard<boost::mutex> l(lock);
 		return val;
 	}
 	
 	void set(int value) {
-		lock_guard<boost::mutex> l(lock);
+		boost::lock_guard<boost::mutex> l(lock);
 		val = value;
 	}
 	
@@ -279,13 +279,13 @@ public:
 	}
 	
 	AtomicInt &operator++() {
-		lock_guard<boost::mutex> l(lock);
+		boost::lock_guard<boost::mutex> l(lock);
 		val++;
 		return *this;
 	}
 	
 	AtomicInt operator++(int) {
-		lock_guard<boost::mutex> l(lock);
+		boost::lock_guard<boost::mutex> l(lock);
 		AtomicInt temp(*this);
 		val++;
 		return temp;

data/test/cxx/UnionStationTest.cpp

@@ -61,9 +61,11 @@ namespace tut {
 		}
 		
 		void startLoggingServer(const function<void ()> &initFunc = function<void ()>()) {
+			VariantMap options;
+			options.set("analytics_dump_file", dumpFile);
 			serverFd = createUnixServer(socketFilename.c_str());
 			server = ptr(new LoggingServer(eventLoop,
-				serverFd, accountsDatabase, dumpFile));
+				serverFd, accountsDatabase, options));
 			if (initFunc) {
 				initFunc();
 			}

data/test/cxx/UtilsTest.cpp

@@ -333,6 +333,8 @@ namespace tut {
 			(mode_t) (S_IRUSR | S_IXUSR | S_IWGRP | S_IXOTH));
 		ensure_equals("(7)", parseModeString("u=rs,g=ws"),
 			(mode_t) (S_IRUSR | S_ISUID | S_IWGRP | S_ISGID));
+		ensure_equals("(7)", parseModeString("u=rwx,g=rwx,+t"),
+			(mode_t) (S_IRWXU | S_IRWXG | S_ISVTX));
 	}
 	
 	TEST_METHOD(38) {

data/test/integration_tests/apache2_tests.rb

@@ -458,8 +458,8 @@ describe "Apache 2 module" do
 			# Wait until the server has processed the session close event.
 			sleep 0.1
 			
-			processes = instance.connect(:passenger_status) do
-				instance.processes
+			processes = instance.connect(:role => :passenger_status) do |client|
+				instance.processes(client)
 			end
 			processes.should have(1).item
 			processes[0].group.name.should == @mycook.full_app_root + "#default"

data/test/integration_tests/native_packaging_spec.rb

@@ -0,0 +1,170 @@
+# encoding: utf-8
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2013 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.
+
+# 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
+
+BINDIR = "/usr/bin"
+SBINDIR = "/usr/sbin"
+INCLUDEDIR = "/usr/share/passenger/include"
+NGINX_ADDON_DIR = "/usr/share/passenger/ngx_http_passenger_module"
+DOCDIR = "/usr/share/doc/ruby-passenger"
+RESOURCESDIR = "/usr/share/passenger"
+RUBY_EXTENSION_SOURCE_DIR = "/usr/share/passenger/ruby_extension_source"
+AGENTS_DIR = "/usr/lib/passenger/agents"
+APACHE2_MODULE_PATH = "/usr/lib/apache2/modules/mod_passenger.so"
+
+describe "A natively packaged Phusion Passenger" do
+	def capture_output(command)
+		output = `#{command}`.strip
+		if $?.exitstatus == 0
+			return output
+		else
+			abort "Command #{command.join(' ')} exited with status #{$?.exitstatus}"
+		end
+	end
+
+	def which(command)
+		return capture_output("which #{command}")
+	end
+
+	specify "locations.ini only refers to existent filesystem locations" do
+		File.read(LOCATIONS_INI).split("\n").each do |line|
+			if line =~ /=/
+				name, filename = line.split('=', 2)
+				if filename =~ /^\// && !File.exist?(filename)
+					raise "#{filename} does not exist"
+				end
+			end
+		end
+	end
+
+	specify "passenger-install-nginx-module is in #{BINDIR}" do
+		which("passenger-install-nginx-module").should == "#{BINDIR}/passenger-install-nginx-module"
+	end
+
+	specify "passenger-status is in #{SBINDIR}" do
+		which("passenger-status").should == "#{SBINDIR}/passenger-status"
+	end
+
+	specify "the Nginx runtime library headers exist" do
+		File.directory?(INCLUDEDIR).should be_true
+		Dir["#{INCLUDEDIR}/common/*.h"].should_not be_empty
+	end
+
+	specify "the Nginx addon directory exists" do
+		File.directory?(NGINX_ADDON_DIR).should be_true
+		File.file?("#{NGINX_ADDON_DIR}/ngx_http_passenger_module.c")
+	end
+
+	specify "the documentation directory exists" do
+		File.directory?(DOCDIR).should be_true
+		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
+	end
+
+	specify "the Ruby extension source directory exists" do
+		File.directory?(RUBY_EXTENSION_SOURCE_DIR).should be_true
+		File.file?("#{RUBY_EXTENSION_SOURCE_DIR}/extconf.rb").should be_true
+	end
+
+	specify "the agents directory exists" do
+		File.directory?(AGENTS_DIR).should be_true
+		File.file?("#{AGENTS_DIR}/PassengerWatchdog").should be_true
+		File.executable?("#{AGENTS_DIR}/PassengerWatchdog").should be_true
+	end
+
+	specify "the Apache 2 module exists" do
+		File.file?(APACHE2_MODULE_PATH).should be_true
+	end
+
+	describe "passenger-config" do
+		it "passenger-config is in #{BINDIR}" do
+			which("passenger-config").should == "#{BINDIR}/passenger-config"
+		end
+
+		it "shows the path to locations.ini" do
+			capture_output("passenger-config --root").should == LOCATIONS_INI
+		end
+
+		it "recognizes the runtime libraries as compiled" do
+			system("passenger-config --compiled").should be_true
+		end
+
+		it "recognizes the install as natively packaged" do
+			system("passenger-config --natively-packaged").should be_true
+		end
+
+		it "shows the directory to the runtime library headers" do
+			capture_output("passenger-config --includedir").should == INCLUDEDIR
+		end
+
+		it "shows the directory to the Nginx addon" do
+			capture_output("passenger-config --nginx-addon-dir").should == NGINX_ADDON_DIR
+		end
+
+		it "shows the Nginx runtime libraries" do
+			libs = capture_output("passenger-config --nginx-libs").split(" ")
+			libs.should_not be_empty
+			libs.each do |lib|
+				File.file?(lib).should be_true
+			end
+		end
+	end
+
+	describe "passenger-memory-stats" do
+		it "is in #{SBINDIR}" do
+			which("passenger-memory-stats").should == "#{SBINDIR}/passenger-memory-stats"
+		end
+
+		it "works" do
+			capture_output("passenger-memory-stats").should =~ /Passenger processes/
+		end
+	end
+
+	describe "passenger-install-apache2-module" do
+		it "is in #{BINDIR}" do
+			which("passenger-install-apache2-module").should == "#{BINDIR}/passenger-install-apache2-module"
+		end
+
+		it "prints the configuration snippet and exits" do
+			output = capture_output("passenger-install-apache2-module --auto")
+			output.should =~ /Please edit your Apache configuration file/
+			output.should_not include("Compiling and installing Apache 2 module")
+			output.should_not include("rake apache2")
+		end
+
+		it "produces a correct configuration snippet" do
+			output = capture_output("passenger-install-apache2-module --auto")
+			output.should include("LoadModule passenger_module #{APACHE2_MODULE_PATH}")
+			output.should include("PassengerRoot #{LOCATIONS_INI}")
+		end
+	end
+end