[前][次][番号順一覧][スレッド一覧]

ruby-changes:42180

From: nobu <ko1@a...>
Date: Fri, 25 Mar 2016 01:04:56 +0900 (JST)
Subject: [ruby-changes:42180] nobu:r54254 (trunk): test_find_executable.rb: each_exts

nobu	2016-03-25 01:04:51 +0900 (Fri, 25 Mar 2016)

  New Revision: 54254

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54254

  Log:
    test_find_executable.rb: each_exts
    
    * test/mkmf/test_find_executable.rb (each_exts): extract common
      setup.

  Modified files:
    trunk/test/mkmf/test_find_executable.rb
Index: test/mkmf/test_find_executable.rb
===================================================================
--- test/mkmf/test_find_executable.rb	(revision 54253)
+++ test/mkmf/test_find_executable.rb	(revision 54254)
@@ -8,6 +8,16 @@ class TestMkmf https://github.com/ruby/ruby/blob/trunk/test/mkmf/test_find_executable.rb#L8
       @path, ENV["PATH"] = ENV["PATH"], @tmpdir
     end
 
+    def each_exts(&block)
+      name = "foobar#{$$}#{rand(1000)}"
+      stdout.filter {|s| s.sub(name, "<executable>")}
+      exts = mkmf {self.class::CONFIG['EXECUTABLE_EXTS']}.split
+      exts[0] ||= ""
+      exts.each do |ext|
+        yield name+ext, name
+      end
+    end
+
     def teardown
       ENV["PATH"] = @path
       super
@@ -15,29 +25,19 @@ class TestMkmf https://github.com/ruby/ruby/blob/trunk/test/mkmf/test_find_executable.rb#L25
 
     def test_find_executable
       bug2669 = '[ruby-core:27912]'
-      name = "foobar#{$$}#{rand(1000)}"
-      exts = mkmf {self.class::CONFIG['EXECUTABLE_EXTS']}.split
-      stdout.filter {|s| s.sub(name, "<executable>")}
-      exts[0] ||= ""
-      exts.each do |ext|
-        full = name+ext
+      each_exts do |full, name|
         begin
           open(full, "w") {|ff| ff.chmod(0755)}
           result = mkmf {find_executable(name)}
         ensure
           File.unlink(full)
         end
-        assert_equal("#{@tmpdir}/#{name}#{ext}", result, bug2669)
+        assert_equal("#{@tmpdir}/#{full}", result, bug2669)
       end
     end
 
     def test_find_executable_dir
-      name = "foobar#{$$}#{rand(1000)}"
-      exts = mkmf {self.class::CONFIG['EXECUTABLE_EXTS']}.split
-      stdout.filter {|s| s.sub(name, "<executable>")}
-      exts[0] ||= ""
-      exts.each do |ext|
-        full = name+ext
+      each_exts do |full, name|
         begin
           Dir.mkdir(full)
           result = mkmf {find_executable(name)}

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

[前][次][番号順一覧][スレッド一覧]