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

ruby-changes:59022

From: Benoit <ko1@a...>
Date: Sun, 1 Dec 2019 22:30:03 +0900 (JST)
Subject: [ruby-changes:59022] 60d362b0bb (master): Update to ruby/mspec@aa28e95

https://git.ruby-lang.org/ruby.git/commit/?id=60d362b0bb

From 60d362b0bb0fb56bd3ef61c93f71bff997ccb824 Mon Sep 17 00:00:00 2001
From: Benoit Daloze <eregontp@g...>
Date: Sun, 1 Dec 2019 14:11:40 +0100
Subject: Update to ruby/mspec@aa28e95


diff --git a/spec/mspec/tool/sync/sync-rubyspec.rb b/spec/mspec/tool/sync/sync-rubyspec.rb
index 2da7f8e..48047e0 100644
--- a/spec/mspec/tool/sync/sync-rubyspec.rb
+++ b/spec/mspec/tool/sync/sync-rubyspec.rb
@@ -162,12 +162,7 @@ end https://github.com/ruby/ruby/blob/trunk/spec/mspec/tool/sync/sync-rubyspec.rb#L162
 def test_new_specs
   require "yaml"
   Dir.chdir(SOURCE_REPO) do
-    versions = YAML.load_file(".travis.yml")
-    versions = if versions.include? "matrix"
-      versions["matrix"]["include"].map { |job| job["rvm"] }
-    else
-      versions["rvm"]
-    end
+    versions = YAML.load_file("#{MSPEC_REPO}/.travis.yml").fetch("rvm")
     versions = versions.grep(/^\d+\./) # Test on MRI
     min_version, max_version = versions.minmax
 
diff --git a/spec/mspec/tool/tag_from_output.rb b/spec/mspec/tool/tag_from_output.rb
index 1802aa9..43fc480 100755
--- a/spec/mspec/tool/tag_from_output.rb
+++ b/spec/mspec/tool/tag_from_output.rb
@@ -21,6 +21,10 @@ output.slice_before(NUMBER).select { |number, error_line, *rest| https://github.com/ruby/ruby/blob/trunk/spec/mspec/tool/tag_from_output.rb#L21
   description = error_line.match(ERROR_OR_FAILED).pre_match
 
   spec_file = rest.find { |line| line =~ SPEC_FILE }
+  unless spec_file
+    warn "Could not find file for:\n#{error_line}"
+    next
+  end
   spec_file = spec_file[SPEC_FILE, 1]
   prefix = spec_file.index('spec/ruby')
   spec_file = spec_file[prefix..-1]
-- 
cgit v0.10.2


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

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