From 079a23e4f868e6615762efcc711cbf86d95876ef Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 6 Feb 2015 22:17:26 +0000 Subject: fix uninstalled testing and reduce require paths This fixes a bug introduced in commit fe83ead4eae6f011fa15f506cd80cb4256813a92 (GNUmakefile: fix clean gem build + reduce build cruft) which broke clean Ruby installations without an existing unicorn gem installed :x --- test/exec/test_exec.rb | 2 +- test/unit/test_http_parser.rb | 2 +- test/unit/test_http_parser_ng.rb | 2 +- test/unit/test_request.rb | 2 +- test/unit/test_response.rb | 2 +- test/unit/test_server.rb | 2 +- test/unit/test_signals.rb | 2 +- test/unit/test_socket_helper.rb | 2 +- test/unit/test_upload.rb | 2 +- test/unit/test_util.rb | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) (limited to 'test') diff --git a/test/exec/test_exec.rb b/test/exec/test_exec.rb index 10a1bae..6deb96b 100644 --- a/test/exec/test_exec.rb +++ b/test/exec/test_exec.rb @@ -2,7 +2,7 @@ # Copyright (c) 2009 Eric Wong FLOCK_PATH = File.expand_path(__FILE__) -require 'test/test_helper' +require './test/test_helper' do_test = true $unicorn_bin = ENV['UNICORN_TEST_BIN'] || "unicorn" diff --git a/test/unit/test_http_parser.rb b/test/unit/test_http_parser.rb index 2251dcf..431ede5 100644 --- a/test/unit/test_http_parser.rb +++ b/test/unit/test_http_parser.rb @@ -7,7 +7,7 @@ # Additional work donated by contributors. See git history # for more information. -require 'test/test_helper' +require './test/test_helper' include Unicorn diff --git a/test/unit/test_http_parser_ng.rb b/test/unit/test_http_parser_ng.rb index d5c8d2e..0c81072 100644 --- a/test/unit/test_http_parser_ng.rb +++ b/test/unit/test_http_parser_ng.rb @@ -1,6 +1,6 @@ # -*- encoding: binary -*- -require 'test/test_helper' +require './test/test_helper' require 'digest/md5' include Unicorn diff --git a/test/unit/test_request.rb b/test/unit/test_request.rb index fbda1a2..f0ccaf7 100644 --- a/test/unit/test_request.rb +++ b/test/unit/test_request.rb @@ -4,7 +4,7 @@ # You can redistribute it and/or modify it under the same terms as Ruby 1.8 or # the GPLv2+ (GPLv3+ preferred) -require 'test/test_helper' +require './test/test_helper' include Unicorn diff --git a/test/unit/test_response.rb b/test/unit/test_response.rb index bdca9f5..d0f0c79 100644 --- a/test/unit/test_response.rb +++ b/test/unit/test_response.rb @@ -7,7 +7,7 @@ # Additional work donated by contributors. See git history # for more information. -require 'test/test_helper' +require './test/test_helper' require 'time' include Unicorn diff --git a/test/unit/test_server.rb b/test/unit/test_server.rb index 9c92bab..8b3afad 100644 --- a/test/unit/test_server.rb +++ b/test/unit/test_server.rb @@ -7,7 +7,7 @@ # Additional work donated by contributors. See git history # for more information. -require 'test/test_helper' +require './test/test_helper' include Unicorn diff --git a/test/unit/test_signals.rb b/test/unit/test_signals.rb index 443c736..4592819 100644 --- a/test/unit/test_signals.rb +++ b/test/unit/test_signals.rb @@ -6,7 +6,7 @@ # # Ensure we stay sane in the face of signals being sent to us -require 'test/test_helper' +require './test/test_helper' include Unicorn diff --git a/test/unit/test_socket_helper.rb b/test/unit/test_socket_helper.rb index 994b990..8b09198 100644 --- a/test/unit/test_socket_helper.rb +++ b/test/unit/test_socket_helper.rb @@ -1,6 +1,6 @@ # -*- encoding: binary -*- -require 'test/test_helper' +require './test/test_helper' require 'tempfile' class TestSocketHelper < Test::Unit::TestCase diff --git a/test/unit/test_upload.rb b/test/unit/test_upload.rb index bcce4bc..5de02e4 100644 --- a/test/unit/test_upload.rb +++ b/test/unit/test_upload.rb @@ -1,7 +1,7 @@ # -*- encoding: binary -*- # Copyright (c) 2009 Eric Wong -require 'test/test_helper' +require './test/test_helper' require 'digest/md5' include Unicorn diff --git a/test/unit/test_util.rb b/test/unit/test_util.rb index 904d51c..4d17a16 100644 --- a/test/unit/test_util.rb +++ b/test/unit/test_util.rb @@ -1,6 +1,6 @@ # -*- encoding: binary -*- -require 'test/test_helper' +require './test/test_helper' require 'tempfile' class TestUtil < Test::Unit::TestCase -- cgit v1.2.3-24-ge0c7