summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorBenoit Daloze <eregontp@gmail.com>2019-12-01 14:11:40 +0100
committerBenoit Daloze <eregontp@gmail.com>2019-12-01 14:11:40 +0100
commit60d362b0bb0fb56bd3ef61c93f71bff997ccb824 (patch)
tree513f364bf19107e2fbc186f896ecddec64dd9ebe /spec
parentab516e263c06fbd755d4805ad529c32b1b8292b5 (diff)
Update to ruby/mspec@aa28e95
Diffstat (limited to 'spec')
-rw-r--r--spec/mspec/tool/sync/sync-rubyspec.rb7
-rwxr-xr-xspec/mspec/tool/tag_from_output.rb4
2 files changed, 5 insertions, 6 deletions
diff --git a/spec/mspec/tool/sync/sync-rubyspec.rb b/spec/mspec/tool/sync/sync-rubyspec.rb
index 2da7f8edb9..48047e013f 100644
--- a/spec/mspec/tool/sync/sync-rubyspec.rb
+++ b/spec/mspec/tool/sync/sync-rubyspec.rb
@@ -162,12 +162,7 @@ end
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 1802aa9261..43fc4808bc 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|
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]