test/cxx/ApplicationPool_PoolTest.cpp test/cxx/ApplicationPool_PoolTestCases.cpp test/cxx/ApplicationPool_ServerTest.cpp test/cxx/ApplicationPool_Server_PoolTest.cpp test/cxx/Base64Test.cpp test/cxx/CachedFileStatTest.cpp test/cxx/CxxTestMain.cpp test/cxx/FileChangeCheckerTest.cpp test/cxx/FileDescriptorTest.cpp test/cxx/HttpStatusExtractorTest.cpp test/cxx/MessageChannelTest.cpp test/cxx/MessageServerTest.cpp test/cxx/PoolOptionsTest.cpp test/cxx/ScgiRequestParserTest.cpp test/cxx/ServerInstanceDirTest.cpp test/cxx/SpawnManagerTest.cpp test/cxx/StaticStringTest.cpp test/cxx/SystemTimeTest.cpp test/cxx/TestSupport.cpp test/cxx/TestSupport.h test/cxx/UtilsTest.cpp test/tut/tut.h test/tut/tut_reporter.h @@ -12,7 +12,6 @@ ext/apache2/*.la ext/apache2/*.lo ext/apache2/*.slo ext/apache2/.libs -ext/apache2/ApplicationPoolServerExecutable ext/apache2/PassengerWatchdog ext/apache2/PassengerHelperServer ext/nginx/HelperServer @@ -25,8 +24,7 @@ test/test.log test/apache2.log test/config.yml test/coverage -test/CxxTests -test/ApplicationPoolServerExecutable +test/cxx/CxxTestMain test/oxt/oxt_test_main test/stub/railsapp/app/controllers/bar_controller.rb test/stub/apache2/*.log .gitignore @@ -392,33 +392,61 @@ end 'syscall_interruption_test.o' => %w(syscall_interruption_test.cpp) } + desc "Run unit tests for the OXT library" + task 'test:oxt' => 'test/oxt/oxt_test_main' do + sh "cd test && ./oxt/oxt_test_main" + end + + # Define task for test/oxt/oxt_test_main. + oxt_test_main_dependencies = TEST_OXT_OBJECTS.keys.map do |object| + "test/oxt/#{object}" + end + oxt_test_main_dependencies << TEST_BOOST_OXT_LIBRARY + file 'test/oxt/oxt_test_main' => oxt_test_main_dependencies do + objects = TEST_OXT_OBJECTS.keys.map{ |x| "test/oxt/#{x}" }.join(' ') + create_executable("test/oxt/oxt_test_main", objects, TEST_OXT_LDFLAGS) + end + + # Define tasks for each OXT test source file. + TEST_OXT_OBJECTS.each_pair do |target, sources| + file "test/oxt/#{target}" => sources.map{ |x| "test/oxt/#{x}" } do + Dir.chdir('test/oxt') do + puts "### In test/oxt:" + compile_cxx sources[0], TEST_OXT_CFLAGS + end + end + end + + + ### C++ components tests ### + TEST_CXX_CFLAGS = "-Iext -Iext/common -Iext/nginx -Itest/support " << "#{PlatformInfo.apr_flags} #{PlatformInfo.apu_flags} #{TEST_COMMON_CFLAGS}" TEST_CXX_LDFLAGS = "#{PlatformInfo.apr_libs} #{PlatformInfo.apu_libs} " << "#{TEST_COMMON_LIBRARY} #{TEST_BOOST_OXT_LIBRARY} " << "#{PlatformInfo.portability_ldflags} #{EXTRA_LDFLAGS}" TEST_CXX_OBJECTS = { - 'test/CxxTestMain.o' => %w( - test/CxxTestMain.cpp), - 'test/support/Support.o' => %w( - test/support/Support.cpp - test/support/Support.h), - 'test/MessageChannelTest.o' => %w( - test/MessageChannelTest.cpp + 'test/cxx/CxxTestMain.o' => %w( + test/cxx/CxxTestMain.cpp), + 'test/cxx/TestSupport.o' => %w( + test/cxx/TestSupport.cpp + test/cxx/TestSupport.h), + 'test/cxx/MessageChannelTest.o' => %w( + test/cxx/MessageChannelTest.cpp ext/common/MessageChannel.h ext/common/Exceptions.h ext/common/Timer.h ext/common/Utils.h), - 'test/SpawnManagerTest.o' => %w( - test/SpawnManagerTest.cpp + 'test/cxx/SpawnManagerTest.o' => %w( + test/cxx/SpawnManagerTest.cpp ext/common/SpawnManager.h ext/common/AbstractSpawnManager.h ext/common/PoolOptions.h ext/common/StringListCreator.h ext/common/Application.h ext/common/MessageChannel.h), - 'test/ApplicationPool_ServerTest.o' => %w( - test/ApplicationPool_ServerTest.cpp + 'test/cxx/ApplicationPool_ServerTest.o' => %w( + test/cxx/ApplicationPool_ServerTest.cpp ext/common/ApplicationPool/Interface.h ext/common/ApplicationPool/Server.h ext/common/ApplicationPool/Client.h @@ -429,9 +457,9 @@ end ext/common/PoolOptions.h ext/common/StringListCreator.h ext/common/MessageChannel.h), - 'test/ApplicationPool_Server_PoolTest.o' => %w( - test/ApplicationPool_Server_PoolTest.cpp - test/ApplicationPool_PoolTestCases.cpp + 'test/cxx/ApplicationPool_Server_PoolTest.o' => %w( + test/cxx/ApplicationPool_Server_PoolTest.cpp + test/cxx/ApplicationPool_PoolTestCases.cpp ext/common/ApplicationPool/Interface.h ext/common/ApplicationPool/Server.h ext/common/ApplicationPool/Client.h @@ -445,9 +473,9 @@ end ext/common/StringListCreator.h ext/common/Application.h ext/common/MessageChannel.h), - 'test/ApplicationPool_PoolTest.o' => %w( - test/ApplicationPool_PoolTest.cpp - test/ApplicationPool_PoolTestCases.cpp + 'test/cxx/ApplicationPool_PoolTest.o' => %w( + test/cxx/ApplicationPool_PoolTest.cpp + test/cxx/ApplicationPool_PoolTestCases.cpp ext/common/ApplicationPool/Interface.h ext/common/ApplicationPool/Pool.h ext/common/AbstractSpawnManager.h @@ -457,102 +485,74 @@ end ext/common/FileChangeChecker.h ext/common/CachedFileStat.hpp ext/common/Application.h), - 'test/PoolOptionsTest.o' => %w( - test/PoolOptionsTest.cpp + 'test/cxx/PoolOptionsTest.o' => %w( + test/cxx/PoolOptionsTest.cpp ext/common/PoolOptions.h ext/common/StringListCreator.h), - 'test/StaticStringTest.o' => %w( - test/StaticStringTest.cpp + 'test/cxx/StaticStringTest.o' => %w( + test/cxx/StaticStringTest.cpp ext/common/StaticString.h), - 'test/Base64Test.o' => %w( - test/Base64Test.cpp + 'test/cxx/Base64Test.o' => %w( + test/cxx/Base64Test.cpp ext/common/Base64.h ext/common/Base64.cpp), - 'test/ScgiRequestParserTest.o' => %w( - test/ScgiRequestParserTest.cpp + 'test/cxx/ScgiRequestParserTest.o' => %w( + test/cxx/ScgiRequestParserTest.cpp ext/nginx/ScgiRequestParser.h ext/common/StaticString.h), - 'test/HttpStatusExtractorTest.o' => %w( - test/HttpStatusExtractorTest.cpp + 'test/cxx/HttpStatusExtractorTest.o' => %w( + test/cxx/HttpStatusExtractorTest.cpp ext/nginx/HttpStatusExtractor.h), - 'test/MessageServerTest.o' => %w( - test/MessageServerTest.cpp + 'test/cxx/MessageServerTest.o' => %w( + test/cxx/MessageServerTest.cpp ext/common/ApplicationPool/Client.h ext/common/Account.h ext/common/AccountsDatabase.h ext/common/MessageServer.h ext/common/MessageChannel.h), - 'test/ServerInstanceDir.o' => %w( - test/ServerInstanceDirTest.cpp + 'test/cxx/ServerInstanceDir.o' => %w( + test/cxx/ServerInstanceDirTest.cpp ext/common/ServerInstanceDir.h ext/common/Utils.h), - 'test/FileChangeCheckerTest.o' => %w( - test/FileChangeCheckerTest.cpp + 'test/cxx/FileChangeCheckerTest.o' => %w( + test/cxx/FileChangeCheckerTest.cpp ext/common/FileChangeChecker.h ext/common/CachedFileStat.hpp), - 'test/FileDescriptorTest.o' => %w( - test/FileDescriptorTest.cpp + 'test/cxx/FileDescriptorTest.o' => %w( + test/cxx/FileDescriptorTest.cpp ext/common/FileDescriptor.h), - 'test/SystemTimeTest.o' => %w( - test/SystemTimeTest.cpp + 'test/cxx/SystemTimeTest.o' => %w( + test/cxx/SystemTimeTest.cpp ext/common/SystemTime.h ext/common/SystemTime.cpp), - 'test/CachedFileStatTest.o' => %w( - test/CachedFileStatTest.cpp + 'test/cxx/CachedFileStatTest.o' => %w( + test/cxx/CachedFileStatTest.cpp ext/common/CachedFileStat.hpp ext/common/CachedFileStat.cpp), - 'test/UtilsTest.o' => %w( - test/UtilsTest.cpp + 'test/cxx/UtilsTest.o' => %w( + test/cxx/UtilsTest.cpp ext/common/Utils.h) } - desc "Run unit tests for the OXT library" - task 'test:oxt' => 'test/oxt/oxt_test_main' do - sh "cd test && ./oxt/oxt_test_main" - end - - # Define task for test/oxt/oxt_test_main. - oxt_test_main_dependencies = TEST_OXT_OBJECTS.keys.map do |object| - "test/oxt/#{object}" - end - oxt_test_main_dependencies << TEST_BOOST_OXT_LIBRARY - file 'test/oxt/oxt_test_main' => oxt_test_main_dependencies do - objects = TEST_OXT_OBJECTS.keys.map{ |x| "test/oxt/#{x}" }.join(' ') - create_executable("test/oxt/oxt_test_main", objects, TEST_OXT_LDFLAGS) - end - - # Define tasks for each OXT test source file. - TEST_OXT_OBJECTS.each_pair do |target, sources| - file "test/oxt/#{target}" => sources.map{ |x| "test/oxt/#{x}" } + ['test/support/Support.h'] do - Dir.chdir('test/oxt') do - puts "### In test/oxt:" - compile_cxx sources[0], TEST_OXT_CFLAGS - end - end - end - - - ### C++ components tests ### - desc "Run unit tests for the Apache 2 and Nginx C++ components" - task 'test:cxx' => ['test/CxxTests', :native_support] do + task 'test:cxx' => ['test/cxx/CxxTestMain', :native_support] do if ENV['GROUPS'].to_s.empty? - sh "cd test && ./CxxTests" + sh "cd test && ./cxx/CxxTestMain" else args = ENV['GROUPS'].split(",").map{ |name| "-g #{name}" } - sh "cd test && ./CxxTests #{args.join(' ')}" + sh "cd test && ./cxx/CxxTestMain #{args.join(' ')}" end end cxx_tests_dependencies = [TEST_CXX_OBJECTS.keys, TEST_BOOST_OXT_LIBRARY, TEST_COMMON_LIBRARY] - file 'test/CxxTests' => cxx_tests_dependencies.flatten do + file 'test/cxx/CxxTestMain' => cxx_tests_dependencies.flatten do objects = TEST_CXX_OBJECTS.keys.join(' ') - create_executable("test/CxxTests", objects, TEST_CXX_LDFLAGS) + create_executable("test/cxx/CxxTestMain", objects, TEST_CXX_LDFLAGS) end TEST_CXX_OBJECTS.each_pair do |target, sources| - file(target => sources) do + file(target => sources + ['test/cxx/TestSupport.h']) do compile_cxx sources[0], "-o #{target} #{TEST_CXX_CFLAGS}" end end @@ -753,9 +753,10 @@ spec = Gem::Specification.new do |s| 'misc/*', 'misc/*/*', 'vendor/**/*', - 'test/*.{rb,cpp,example}', + 'test/*.example', 'test/support/*.{cpp,h,rb}', - 'test/oxt/*.cpp', + 'test/cxx/*.{cpp,h}', + 'test/oxt/*.{cpp,hpp}', 'test/ruby/**/*', 'test/integration_tests/**/*', 'test/stub/**/*' Rakefile @@ -605,9 +605,9 @@ public: * @throws boost::thread_resource_error Cannot spawn a new thread. */ Pool(const string &spawnServerCommand, + const ServerInstanceDir::GenerationPtr &generation, const string &logFile = "", - const string &rubyCommand = "ruby", - const string &user = "") + const string &rubyCommand = "ruby") : data(new SharedData()), cstat(DEFAULT_MAX_POOL_SIZE), lock(data->lock), @@ -621,7 +621,7 @@ public: appInstanceCount(data->appInstanceCount) { TRACE_POINT(); - this->spawnManager = ptr(new SpawnManager(spawnServerCommand, logFile, rubyCommand, user)); + this->spawnManager = ptr(new SpawnManager(spawnServerCommand, generation, logFile, rubyCommand)); initialize(); } ext/common/ApplicationPool/Pool.h @@ -45,6 +45,7 @@ #include <signal.h> #include "AbstractSpawnManager.h" +#include "ServerInstanceDir.h" #include "MessageChannel.h" #include "Exceptions.h" #include "Logging.h" @@ -87,9 +88,9 @@ private: static const int SPAWN_SERVER_INPUT_FD = 3; string spawnServerCommand; + ServerInstanceDir::GenerationPtr generation; string logFile; string rubyCommand; - string user; boost::mutex lock; @@ -172,45 +173,10 @@ private: close(i); } - if (!user.empty()) { - struct passwd *entry = getpwnam(user.c_str()); - if (entry != NULL) { - if (initgroups(user.c_str(), entry->pw_gid) != 0) { - int e = errno; - fprintf(stderr, "*** Passenger: cannot set supplementary " - "groups for user %s: %s (%d)\n", - user.c_str(), - strerror(e), - e); - } - if (setgid(entry->pw_gid) != 0) { - int e = errno; - fprintf(stderr, "*** Passenger: cannot run spawn " - "manager as group %d: %s (%d)\n", - entry->pw_gid, - strerror(e), - e); - } - if (setuid(entry->pw_uid) != 0) { - int e = errno; - fprintf(stderr, "*** Passenger: cannot run spawn " - "manager as user %s (%d): %s (%d)\n", - user.c_str(), entry->pw_uid, - strerror(e), - e); - } - } else { - fprintf(stderr, "*** Passenger: cannot run spawn manager " - "as nonexistant user '%s'.\n", - user.c_str()); - } - fflush(stderr); - } - execlp(rubyCommand.c_str(), rubyCommand.c_str(), spawnServerCommand.c_str(), - getPassengerTempDir().c_str(), + generation->getPath().c_str(), // The spawn server changes the process names of the subservers // that it starts, for better usability. However, the process name length // (as shown by ps) is limited. Here, we try to expand that limit by @@ -424,6 +390,8 @@ public: * Construct a new SpawnManager. * * @param spawnServerCommand The filename of the spawn server to use. + * @param generation The server instance dir generation in which + * generation-specific are stored. * @param logFile Specify a log file that the spawn server should use. * Messages on its standard output and standard error channels * will be written to this log file. If an empty string is @@ -431,23 +399,18 @@ public: * will use the same standard output/error channels as the * current process. * @param rubyCommand The Ruby interpreter's command. - * @param user The user that the spawn manager should run as. This - * parameter only has effect if the current process is - * running as root. If the empty string is given, or if - * the <tt>user</tt> is not a valid username, then - * the spawn manager will be run as the current user. * @throws SystemException An error occured while trying to setup the spawn server. * @throws IOException The specified log file could not be opened. */ SpawnManager(const string &spawnServerCommand, + const ServerInstanceDir::GenerationPtr &generation, const string &logFile = "", - const string &rubyCommand = "ruby", - const string &user = "") { + const string &rubyCommand = "ruby") { TRACE_POINT(); this->spawnServerCommand = spawnServerCommand; + this->generation = generation; this->logFile = logFile; this->rubyCommand = rubyCommand; - this->user = user; pid = 0; this_thread::disable_interruption di; this_thread::disable_syscall_interruption dsi; ext/common/SpawnManager.h @@ -385,143 +385,6 @@ getSystemTempDir() { return temp_dir; } -string -getPassengerTempDir(bool bypassCache, const string &parentDir) { - if (!bypassCache && !passengerTempDir.empty()) { - return passengerTempDir; - } else { - string theParentDir; - char buffer[PATH_MAX]; - - if (parentDir.empty()) { - theParentDir = getSystemTempDir(); - } else { - theParentDir = parentDir; - } - snprintf(buffer, sizeof(buffer), "%s/passenger.%lu", - theParentDir.c_str(), (unsigned long) getpid()); - buffer[sizeof(buffer) - 1] = '\0'; - passengerTempDir = buffer; - return passengerTempDir; - } -} - -void -setPassengerTempDir(const string &dir) { - passengerTempDir = dir; -} - -void -createPassengerTempDir(const string &parentDir, bool userSwitching, - const string &lowestUser, uid_t workerUid, gid_t workerGid) { - string tmpDir(getPassengerTempDir(false, parentDir)); - uid_t lowestUid; - gid_t lowestGid; - string structureVersionFile; - int ret; - - determineLowestUserAndGroup(lowestUser, lowestUid, lowestGid); - - /* Create the temp directory with the current user as owner (which - * is root if the web server was started as root). Only the owner - * may write to this directory. Everybody else may only access the - * directory. The permissions on the subdirectories will determine - * whether a user may access that specific subdirectory. - */ - makeDirTree(tmpDir, "u=wxs,g=x,o=x"); - - /* Write structure version file. If you change the version here don't forget - * to do it in lib/phusion_passenger/admin_tools/server_instance.rb too. - * - * Once written, nobody may write to it; only reading is possible. - */ - structureVersionFile = tmpDir + "/structure_version.txt"; - createFile(structureVersionFile, "1.0", S_IRUSR | S_IRGRP | S_IROTH); - do { - // Try to make it root-owned, but don't care if it fails. - ret = chown(structureVersionFile.c_str(), 0, 0); - } while (ret == -1 && errno == EINTR); - - /* We want this upload buffer directory to be only accessible by the web server's - * worker processs. - * - * It only makes sense to chown webserver_private to workerUid and workerGid if the web server - * is actually able to change the user of the worker processes. That is, if the web server - * is running as root. - */ - if (geteuid() == 0) { - makeDirTree(tmpDir + "/webserver_private", "u=wxs,g=,o=", workerUid, workerGid); - } else { - makeDirTree(tmpDir + "/webserver_private", "u=wxs,g=,o="); - } - - /* If the web server is running as root (i.e. user switching is possible to begin with) - * but user switching is off... - */ - if (geteuid() == 0 && !userSwitching) { - /* ...then the 'info' subdirectory must be owned by lowestUser, so that only root - * or lowestUser (which all backend processes are running as) can query - * Phusion Passenger information. - */ - makeDirTree(tmpDir + "/info", "u=rwxs,g=,o=", lowestUid, lowestGid); - } else { - /* Otherwise just use the current user as the directory's owner. - * This way, only the user that the web server's control process - * is running as will be able to query information. We do this - * because backend processes may be running as arbitrary users. - */ - makeDirTree(tmpDir + "/info", "u=rwxs,g=,o="); - } - - if (geteuid() == 0) { - if (userSwitching) { - /* When Apache is installed with mpm-itk, there may be multiple - * users under which worker processes are running. To ensure that - * all worker processes can connect to the server socket, we make - * this subdirectory world-executable. - */ - makeDirTree(tmpDir + "/master", "u=wxs,g=x,o=x", workerUid, workerGid); - } else { - makeDirTree(tmpDir + "/master", "u=wxs,g=x,o=x", lowestUid, lowestGid); - } - } else { - makeDirTree(tmpDir + "/master", "u=wxs,g=,o="); - } - - if (geteuid() == 0) { - if (userSwitching) { - /* If user switching is possible and turned on, then each backend - * process may be running as a different user, so the backends - * subdirectory must be world-writable. However we don't want - * everybody to be able to know the sockets' filenames, so - * the directory is not readable, not even by its owner. - */ - makeDirTree(tmpDir + "/backends", "u=wxs,g=wx,o=wx"); - } else { - /* If user switching is off then all backend processes will be - * running as lowestUser, so make lowestUser the owner of the - * directory. Nobody else (except root) may access this directory. - * - * The directory is not readable as a security precaution: - * nobody should be able to know the sockets' filenames without - * having access to the application pool. - */ - makeDirTree(tmpDir + "/backends", "u=wxs,g=,o=", lowestUid, lowestGid); - } - } else { - /* If user switching is not possible then all backend processes will - * be running as the same user as the web server. So we'll make the - * backends subdirectory only writable by this user. Nobody else - * (except root) may access this subdirectory. - * - * The directory is not readable as a security precaution: - * nobody should be able to know the sockets' filenames without having - * access to the application pool. - */ - makeDirTree(tmpDir + "/backends", "u=wxs,g=,o="); - } -} - void makeDirTree(const string &path, const char *mode, uid_t owner, gid_t group) { char command[PATH_MAX + 10]; ext/common/Utils.cpp @@ -282,36 +282,6 @@ void determineLowestUserAndGroup(const string &user, uid_t &uid, gid_t &gid); */ const char *getSystemTempDir(); -/** - * Return the path name for the directory in which Phusion Passenger-specific - * temporary files are to be stored. This directory is unique for this instance - * of the web server in which Phusion Passenger is running. - * - * The calculated value will be stored in an internal variable, so that subsequent - * calls will return the same value. To bypass the usage of this internal variable, - * set <tt>bypassCache</tt> to true. In this case, the value of the internal - * variable will be set to the newly calculated value. - * - * @param bypassCache Whether the value of the internal variable should be bypassed. - * @param parentDir The directory under which the Phusion Passenger-specific - * temp directory should be located. If set to the empty string, - * then the return value of getSystemTempDir() will be used. - * This argument only has effect if the value of the internal - * variable is not consulted. - * @ensure !result.empty() - * @ingroup Support - */ -string getPassengerTempDir(bool bypassCache = false, const string &parentDir = ""); - -/** - * Force subsequent calls to <tt>getPassengerTempDir(false, ...)</tt> to return the given value. - * <tt>dir</tt> is not created automatically if it doesn't exist. - * - * <tt>dir</tt> may also be an empty string, in which case it will cause the next - * call to <tt>getPassengerTempDir()</tt> to re-calculate the temp directory's path. - */ -void setPassengerTempDir(const string &dir); - /* Create a temporary directory for storing Phusion Passenger instance-specific * temp files, such as temporarily buffered uploads, sockets for backend * processes, etc. @@ -358,9 +328,9 @@ void setPassengerTempDir(const string &dir); * @throws SystemException Something went wrong. * @throws FileSystemException Something went wrong. */ -void createPassengerTempDir(const string &parentDir, bool userSwitching, +/* void createPassengerTempDir(const string &parentDir, bool userSwitching, const string &lowestUser, - uid_t workerUid, gid_t workerGid); + uid_t workerUid, gid_t workerGid); */ /** * Create the directory at the given path, creating intermediate directories ext/common/Utils.h @@ -79,7 +79,14 @@ private lower_privilege('passenger_wsgi.py', lowest_user) end - socket_file = "#{passenger_tmpdir}/backends/wsgi_backend.#{Process.pid}.#{rand 10000000}" + if defined?(NativeSupport) + unix_path_max = NativeSupport::UNIX_PATH_MAX + else + unix_path_max = 100 + end + + socket_file = "#{passenger_tmpdir}/backends/wsgi.#{Process.pid}.#{rand 10000000}" + socket_file = socket_file.slice(0, unix_path_max - 1) server = UNIXServer.new(socket_file) begin reader, writer = IO.pipe lib/phusion_passenger/wsgi/application_spawner.rb @@ -1,4 +1,4 @@ -#include "tut.h" +#include "../tut/tut.h" #include "counter.hpp" #include <oxt/backtrace.hpp> #include <oxt/tracable_exception.hpp> test/oxt/backtrace_test.cpp @@ -1,4 +1,4 @@ -#include "tut.h" +#include "../tut/tut.h" #include "counter.hpp" #include <boost/bind.hpp> #include <boost/thread/thread_time.hpp> test/oxt/dynamic_thread_group_test.cpp @@ -1,5 +1,5 @@ -#include "tut.h" -#include "tut_reporter.h" +#include "../tut/tut.h" +#include "../tut/tut_reporter.h" #include <oxt/system_calls.hpp> #include <signal.h> #include <cstdlib> test/oxt/oxt_test_main.cpp @@ -1,4 +1,4 @@ -#include "tut.h" +#include "../tut/tut.h" #include <boost/bind.hpp> #include <boost/thread.hpp> #include <oxt/spin_lock.hpp> test/oxt/spin_lock_test.cpp @@ -1,4 +1,4 @@ -#include "tut.h" +#include "../tut/tut.h" #include <boost/bind.hpp> #include <oxt/thread.hpp> #include <oxt/system_calls.hpp> test/oxt/syscall_interruption_test.cpp ext/common/ApplicationPoolController.h ext/common/ApplicationPoolServerExecutable.cpp test/ApplicationPool_PoolTest.cpp test/ApplicationPool_PoolTestCases.cpp test/ApplicationPool_ServerTest.cpp test/ApplicationPool_Server_PoolTest.cpp test/Base64Test.cpp test/CachedFileStatTest.cpp test/CxxTestMain.cpp test/FileChangeCheckerTest.cpp test/FileDescriptorTest.cpp test/HttpStatusExtractorTest.cpp test/MessageChannelTest.cpp test/MessageServerTest.cpp test/PoolOptionsTest.cpp test/ScgiRequestParserTest.cpp test/ServerInstanceDirTest.cpp test/SpawnManagerTest.cpp test/StaticStringTest.cpp test/SystemTimeTest.cpp test/UtilsTest.cpp test/support/Support.cpp test/support/Support.h test/support/tut.h test/support/tut_reporter.h 9d766c7847cfeb8a35deb3617cbf1c8e22220d0a Hongli Lai (Phusion) hongli@phusion.nl http://github.com/FooBarWidget/passenger/commit/195f00f3ef64000d9989072d3f7ea6f3aaaf3bc1 195f00f3ef64000d9989072d3f7ea6f3aaaf3bc1 2009-09-13T07:20:59-07:00 2009-09-13T07:20:59-07:00 Correctly propagate generation directory information to the spawn manager; refactor unit tests to better handle server instance directories; get rid of getPassengerTempDir() and createPassengerTempDir(). 210b1fd6df622739a9cedaf24ed5d4b9c684a757 Hongli Lai (Phusion) hongli@phusion.nl