fix backtrace suppression for rubinius

jimweirich · Nov 9, 2012 · 7c841a3 · 7c841a3
1 parent de88a99
commit 7c841a3
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 10 deletions.
diff --git a/lib/rake/backtrace.rb b/lib/rake/backtrace.rb
@@ -5,8 +5,9 @@ module Backtrace
                                  keys.grep(/(prefix|libdir)/)) + [
         File.join(File.dirname(__FILE__), ".."),
       ].map { |f| Regexp.quote(File.expand_path(f)) }
+    SUPPRESSED_PATHS.reject! { |s| s.nil? || s =~ /^ *$/ }
 
-    SUPPRESS_PATTERN = %r!(\A#{SUPPRESSED_PATHS.join('|')}|bin/rake:\d+)!
+    SUPPRESS_PATTERN = %r!(\A#{SUPPRESSED_PATHS.join('|')}|bin/rake:\d+)!i
 
     def self.collapse(backtrace)
       pattern = Rake.application.options.suppress_backtrace_pattern ||

diff --git a/test/test_rake_application.rb b/test/test_rake_application.rb
@@ -498,4 +498,3 @@ def loader.make_dummy
   end
 
 end
-
diff --git a/test/test_rake_backtrace.rb b/test/test_rake_backtrace.rb
@@ -24,8 +24,8 @@ def test_single_collapse
 
     assert_equal "rake aborted!", lines[0]
     assert_equal "foooo!", lines[1]
-    assert_match %r!\A#{Regexp.quote Dir.pwd}/Rakefile:3!, lines[2]
-    assert_match %r!\ATasks:!, lines[3]
+    assert_something_matches %r!\A#{Regexp.quote Dir.pwd}/Rakefile:3!i, lines
+    assert_something_matches %r!\ATasks:!, lines
   end
 
   def test_multi_collapse
@@ -42,9 +42,9 @@ def test_multi_collapse
 
     assert_equal "rake aborted!", lines[0]
     assert_equal "barrr!", lines[1]
-    assert_match %r!\A#{Regexp.quote Dir.pwd}/Rakefile:6!, lines[2]
-    assert_match %r!\A#{Regexp.quote Dir.pwd}/Rakefile:3!, lines[3]
-    assert_match %r!\ATasks:!, lines[4]
+    assert_something_matches %r!\A#{Regexp.quote Dir.pwd}/Rakefile:6!i, lines
+    assert_something_matches %r!\A#{Regexp.quote Dir.pwd}/Rakefile:3!i, lines
+    assert_something_matches %r!\ATasks:!, lines
   end
 
   def test_suppress_option
@@ -57,11 +57,25 @@ def test_suppress_option
     lines = rake("baz").split("\n")
     assert_equal "rake aborted!", lines[0]
     assert_equal "bazzz!", lines[1]
-    assert_match %r!Rakefile!, lines[2]
+    assert_something_matches %r!Rakefile!i, lines
 
-    lines = rake("--suppress-backtrace", "R.k.file", "baz").split("\n")
+    lines = rake("--suppress-backtrace", ".ak.file", "baz").split("\n")
     assert_equal "rake aborted!", lines[0]
     assert_equal "bazzz!", lines[1]
-    refute_match %r!Rakefile!, lines[2]
+    refute_match %r!Rakefile!i, lines[2]
   end
+
+  private
+
+  # Assert that the pattern matches at least one line in +lines+.
+  def assert_something_matches(pattern, lines)
+    lines.each do |ln|
+      if pattern =~ ln
+        assert_match pattern, ln
+        return
+      end
+    end
+    flunk "expected #{pattern.inspect} to match something in:\n    #{lines.join("\n    ")}"
+  end
+
 end