Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Do not test Rails 2.3 on Travis because Rails 2.3 doesn't support Rub…

…yGems 2.0.
  • Loading branch information...
commit 30b3c949f08f396066e1849ce733d3ef85b79a56 1 parent c443f29
Hongli Lai authored April 01, 2013
4  .travis.yml
@@ -4,8 +4,8 @@ env:
4 4
   - TEST_FULL_COMPILE=1
5 5
   - TEST_CXX=1
6 6
   - TEST_CXX=1 SUDO=1
7  
-  - TEST_RUBY=1 TEST_RUBY_VERSION=1.8.7 DEBUG=1
8  
-  - TEST_RUBY=1 TEST_RUBY_VERSION=1.9.3 DEBUG=1
  7
+  - TEST_RUBY=1 TEST_RUBY_VERSION=1.8.7 TEST_CLASSIC_RAILS=0
  8
+  - TEST_RUBY=1 TEST_RUBY_VERSION=1.9.3 TEST_CLASSIC_RAILS=0
9 9
   - TEST_NGINX=1
10 10
   - TEST_APACHE2=1
11 11
 
2  test/ruby/classic_rails/loader_spec.rb
@@ -42,6 +42,6 @@ def rails_version
42 42
 			"end of startup file\n" +
43 43
 			"worker_process_started: forked=false\n"
44 44
 	end
45  
-end
  45
+end if TEST_CLASSIC_RAILS
46 46
 
47 47
 end # module PhusionPassenger
2  test/ruby/classic_rails/preloader_spec.rb
@@ -48,6 +48,6 @@ def rails_version
48 48
 			"end of startup file\n" +
49 49
 			"worker_process_started: forked=true\n"
50 50
 	end
51  
-end
  51
+end if TEST_CLASSIC_RAILS
52 52
 
53 53
 end # module PhusionPassenger
12  test/ruby/spec_helper.rb
@@ -16,7 +16,17 @@
16 16
 	exit 1
17 17
 end
18 18
 
19  
-DEBUG      = ['1', 'y', 'yes'].include?(ENV['DEBUG'].to_s.downcase)
  19
+def boolean_option(name, default_value = false)
  20
+	value = ENV[name]
  21
+	if value.nil? || value.empty?
  22
+		return default_value
  23
+	else
  24
+		return value == "yes" || value == "on" || value == "true" || value == "1"
  25
+	end
  26
+end
  27
+
  28
+DEBUG = boolean_option('DEBUG')
  29
+TEST_CLASSIC_RAILS = boolean_option('TEST_CLASSIC_RAILS', true)
20 30
 AGENTS_DIR = "#{source_root}/agents"
21 31
 
22 32
 $LOAD_PATH.unshift("#{source_root}/lib")

0 notes on commit 30b3c94

Please sign in to comment.
Something went wrong with that request. Please try again.