Skip to content

Commit 6197c86

Browse files
author
murphy
committed
improve behavior of new=lang.test parameter for the test suite
1 parent 684129e commit 6197c86

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

coderay_suite.rb

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ def examples_test scanner, max
171171
for example_filename in examples.sort
172172
@known_issue_description = @known_issue_ticket_url = nil
173173
name = File.basename(example_filename, ".#{extension}")
174-
next if ENV['lang'] && ENV['only'] && ENV['only'] != name
174+
next if ENV['lang'] && ENV['only'] && ![name, '*'].include?(ENV['only'])
175175
print '%20s'.cyan % name + ' '
176176
filesize = File.size(example_filename)
177177
amount = filesize
@@ -343,7 +343,7 @@ def complete_test scanner, code, name
343343
end
344344
print "\b" * 'encoding...'.size
345345

346-
if File.exist?(expected_filename) && !(ENV['lang'] && ENV['new'] && name == ENV['new'])
346+
if File.exist?(expected_filename) && !(ENV['lang'] && ENV['new'] && [name, '*'].include?(ENV['new']))
347347
expected = scanner.class.normalize File.read(expected_filename)
348348
ok = expected == result
349349
if !ok && expected.respond_to?(:encoding) && expected.encoding != result.encoding
@@ -496,9 +496,15 @@ def load_suite name
496496

497497
def check_env_lang
498498
for key in %w(only new)
499-
if ENV[key] && ENV[key][/^(\w+)\.([-\w]+)$/]
500-
ENV['lang'] = $1
501-
ENV[key] = $2
499+
if ENV[key]
500+
case ENV[key]
501+
when /^(\w+)\.([-\w]+)$/
502+
ENV['lang'] = $1
503+
ENV[key] = $2
504+
when /^(\w+)(?:\.\*)?$/
505+
ENV['lang'] = $1
506+
ENV[key] = '*'
507+
end
502508
end
503509
end
504510
end

0 commit comments

Comments
 (0)