drbrain	2012-11-30 12:21:06 +0900 (Fri, 30 Nov 2012)

  New Revision: 38023

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=38023

  Log:
    * lib/rake/backtrace.rb:  Removed duplication in
      Rake::Backtrace::SUPPRESSED_PATHS
    * test/rake/test_rake_backtrace.rb:  Skip tests when tmpdir is in the
      suppressed pattern.

  Modified files:
    trunk/ChangeLog
    trunk/lib/rake/backtrace.rb
    trunk/test/rake/test_rake_backtrace.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 38022)
+++ ChangeLog	(revision 38023)
@@ -1,3 +1,10 @@
+Fri Nov 30 12:20:53 2012  Eric Hodel  <drbrain@s...>
+
+	* lib/rake/backtrace.rb:  Removed duplication in
+	  Rake::Backtrace::SUPPRESSED_PATHS
+	* test/rake/test_rake_backtrace.rb:  Skip tests when tmpdir is in the
+	  suppressed pattern.
+
 Fri Nov 30 11:07:45 2012  Shugo Maeda  <shugo@r...>
 
 	* revert r37993 to avoid SEGV in tests.
Index: lib/rake/backtrace.rb
===================================================================
--- lib/rake/backtrace.rb	(revision 38022)
+++ lib/rake/backtrace.rb	(revision 38023)
@@ -2,7 +2,7 @@
   module Backtrace
     SUPPRESSED_PATHS =
       RbConfig::CONFIG.values_at(*RbConfig::CONFIG.
-                                 keys.grep(/(prefix|libdir)/)) + [
+                                 keys.grep(/(prefix|libdir)/)).uniq + [
         File.join(File.dirname(__FILE__), ".."),
       ].map { |f| Regexp.quote(File.expand_path(f)) }
     SUPPRESSED_PATHS.reject! { |s| s.nil? || s =~ /^ *$/ }
Index: test/rake/test_rake_backtrace.rb
===================================================================
--- test/rake/test_rake_backtrace.rb	(revision 38022)
+++ test/rake/test_rake_backtrace.rb	(revision 38023)
@@ -2,6 +2,14 @@
 require 'open3'
 
 class TestRakeBacktrace < Rake::TestCase
+
+  def setup
+    super
+
+    skip 'tmpdir is suppressed in backtrace' if
+      Dir.pwd =~ Rake::Backtrace::SUPPRESS_PATTERN
+  end
+
   # TODO: factor out similar code in test_rake_functional.rb
   def rake(*args)
     Open3.popen3(RUBY, "-I", @rake_lib, @rake_exec, *args) { |_, _, err, _|

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/