Skip to content

Commit 1f59ade

Browse files
committed
Inherit from our own .rubocop.yml for spec/truffle
1 parent 0e92b94 commit 1f59ade

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

spec/truffle/.rubocop.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
inherit_from: ../../.rubocop.yml
2+
3+
Style/StringLiterals:
4+
Enabled: false

tool/jt.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
src/main/ruby
3737
src/test/ruby
3838
tool/generate-sulongmock.rb
39+
spec/truffle
3940
]
4041

4142
MAC = RbConfig::CONFIG['host_os'].include?('darwin')
@@ -1961,9 +1962,7 @@ def rubocop(*args)
19611962
"GEM_PATH" => gem_home,
19621963
"PATH" => "#{gem_home}/bin:#{ENV['PATH']}"
19631964
}
1964-
if i = args.index('--specs')
1965-
args[i..i] = %w[-c spec/ruby/.rubocop.yml spec/truffle]
1966-
elsif args.empty? or args.all? { |arg| arg.start_with?('-') }
1965+
if args.empty? or args.all? { |arg| arg.start_with?('-') }
19671966
args += RUBOCOP_INCLUDE_LIST
19681967
end
19691968
sh env, "ruby", "#{gem_home}/bin/rubocop", *args
@@ -2033,7 +2032,6 @@ def lint(*args)
20332032
check_dsl_usage unless args.delete '--no-build'
20342033
check_filename_length
20352034
rubocop
2036-
rubocop('--specs')
20372035
sh "tool/lint.sh"
20382036
checkstyle
20392037
check_parser

0 commit comments

Comments
 (0)